diff options
| author |  waker <wakeroid@gmail.com> | 2009-08-27 20:40:06 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2009-08-27 20:40:06 +0200 |
| commit | 8c9425b1b18bc8f76f9fad25d56bd4d3466fe1e3 (patch) | |
| tree | ac42850f2d5b2d4fcda3743089583e94499c4a32 /plugins.h | |
| parent | 931baf241fff9b61010076da7f183db983db11f6 (diff) | |
| parent | f66ceea04ef9a373398f0416130b300629405952 (diff) | |
Merge branch 'master' into plugins
Conflicts:
playlist.c
Diffstat (limited to 'plugins.h')
0 files changed, 0 insertions, 0 deletions