diff options
| author |  Alexey Yakovenko <waker@users.sourceforge.net> | 2013-09-15 22:18:22 +0200 |
|---|---|---|
| committer | Alexey Yakovenko <waker@users.sourceforge.net> | 2013-09-15 22:18:22 +0200 |
| commit | 57f09034f293b027e0ea80d86e97aaa6006f96c2 (patch) | |
| tree | 587075cea2c3469b90d92e21c4ef07237d519479 /junklib.c | |
| parent | 1a9c8ba4b17d65e140a9266b35cb956d2b5e8627 (diff) | |
| parent | 4afe42abc7d71df8f08e5025972b1ca608ede094 (diff) | |
Merge branch 'master' of ssh://git.code.sf.net/p/deadbeef/code
Conflicts:
plugins/gtkui/callbacks.h
plugins/gtkui/deadbeef.glade
plugins/mpgmad/mpgmad.c
streamer.c
Diffstat (limited to 'junklib.c')
0 files changed, 0 insertions, 0 deletions