diff options
author | 2009-08-31 20:01:55 +0200 | |
---|---|---|
committer | 2009-08-31 20:01:55 +0200 | |
commit | 08e1a932dd88cb9195a1ce70d4b62e5d513460f3 (patch) | |
tree | 4e1315110f96042e441a3b5bcdb034bbbcb4754f /configure.in | |
parent | 6aabd78cc8ac501d3b43e4cfb6893612f5012cf5 (diff) | |
parent | 58a92f3cfe79597cc345ba6bd41668c9a44afdde (diff) |
Merge branch 'master' into plugins
Conflicts:
.gitignore
configure.in
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 77d413a7..fb56db7a 100644 --- a/configure.in +++ b/configure.in @@ -43,5 +43,6 @@ gme/Game_Music_Emu-0.5.2/gme/Makefile sid/sidplay-libs-2.1.0/Makefile dumb/Makefile plugins/lastfm/Makefile +deadbeef.desktop ]) |