diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-29 23:14:15 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-29 23:14:15 +0100 |
| commit | 9460844e2a1598dfe24a72dd2a283d02b57caddc (patch) | |
| tree | 0ec32a2b5453d3e5d299aa325b3c5a3be964092a /Makefile.am | |
| parent | e09556d82ca4b470dc8f5904a1080dffe2ffeb7b (diff) | |
| parent | feecc0214decb6d1b9911aafe140034449266430 (diff) | |
Merge branch 'master' into devel
Conflicts:
plugins/vorbis/vorbis.c
streamer.c
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions