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/gtkui/plcommon.h | |
| 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/gtkui/plcommon.h')
| -rw-r--r-- | plugins/gtkui/plcommon.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/gtkui/plcommon.h b/plugins/gtkui/plcommon.h index d0ebedad..f5c04e35 100644 --- a/plugins/gtkui/plcommon.h +++ b/plugins/gtkui/plcommon.h @@ -1,6 +1,6 @@ /* DeaDBeeF - ultimate music player for GNU/Linux systems with X11 - Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net> + Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License |