diff options
| author |  waker <wakeroid@gmail.com> | 2012-04-09 16:29:23 +0200 |
|---|---|---|
| committer | waker <wakeroid@gmail.com> | 2012-04-09 16:29:23 +0200 |
| commit | 516f25073a726709abb83c3b73bd1e53404514c9 (patch) | |
| tree | 68113731910c0df756717191a9cfaf55be514130 /plugins/medialib/Makefile.am | |
| parent | 6502057510696ea575a1cf0143dec02acb7cf01c (diff) | |
| parent | 1ed51a80ec0979bc0be453f75548c59965fbd6f5 (diff) | |
Merge branch 'master' into devel
Conflicts:
plugins/gtkui/callbacks.c
plugins/gtkui/callbacks.h
plugins/gtkui/gtkui.h
Diffstat (limited to 'plugins/medialib/Makefile.am')
0 files changed, 0 insertions, 0 deletions