diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-07-28 11:51:41 +0200 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-07-28 11:51:41 +0200 |
| commit | 4fc8d5ead565c1b4e45eac93fba26ddb3b8566b4 (patch) | |
| tree | 0c6eed66f2aca1755f9a218f5ff8967acf1cc8bc /playlist.h | |
| parent | 514156edddceaa3fad523c2d46bc9ac1e00b6624 (diff) | |
| parent | bfce294151a589c1d91d982d78eba47d16158713 (diff) | |
Merge branch 'devel' into actions
Conflicts:
plugins/hotkeys/hotkeys.c
Diffstat (limited to 'playlist.h')
0 files changed, 0 insertions, 0 deletions