diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-31 20:26:17 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-31 20:26:17 +0100 |
| commit | 6e6dc88fc61f4a84269a592c76c2b6bd0417bf4a (patch) | |
| tree | 8b5b1fe103a9a4e93a680493d9f1dd2fcb71ded2 /Makefile.am | |
| parent | 9460844e2a1598dfe24a72dd2a283d02b57caddc (diff) | |
| parent | 893655b27084db6399b82069a5dcb56d6e98fbfa (diff) | |
Merge branch 'master' into devel
Conflicts:
main.c
plugins/flac/flac.c
plugins/mpgmad/mpgmad.c
streamer.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index c77e96e6..5b5fe6ea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,7 +53,6 @@ deadbeef_SOURCES =\ plugins.c plugins.h moduleconf.h\ playlist.c playlist.h \ streamer.c streamer.h\ - codec.c codec.h\ messagepump.c messagepump.h\ conf.c conf.h\ playback.h\ |