diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-28 22:14:16 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-28 22:14:16 +0100 |
| commit | 928439ce2bb2b856a00e1fe25cb7805ebc962c5e (patch) | |
| tree | 2f9151c2a41b07ddc6ef2dcbd9ef3688445563e0 /plugins/adplug | |
| parent | 3d030ccade41504430b383a286bf9916233d2b6d (diff) | |
| parent | 8fa99e77209becf413cac6b75fd9c1c7b0c9bdb2 (diff) | |
Merge branch 'master' into devel
Conflicts:
plugins/wavpack/wavpack.c
Diffstat (limited to 'plugins/adplug')
0 files changed, 0 insertions, 0 deletions