diff options
| author |  waker <wakeroid@gmail.com> | 2010-11-20 11:50:11 +0100 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2010-11-20 11:50:11 +0100 |
| commit | 5a5025ff2086e01c2f0164d9c9bb1b3e20a279d1 (patch) | |
| tree | ecdb74e123f1f32f993c0547368af6088a2fc310 /PORTABLE_BUILD | |
| parent | 21e46269269b82e756fef0051e0953c52d6be3ca (diff) | |
| parent | 4f4cf2190aef650ad6e93a9ad86ed0207101f0a7 (diff) | |
Merge branch 'master' into static
Conflicts:
plugins/artwork/artwork.c
plugins/gtkui/coverart.c
Diffstat (limited to 'PORTABLE_BUILD')
0 files changed, 0 insertions, 0 deletions