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/ffap/ffap.c | |
| 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/ffap/ffap.c')
| -rw-r--r-- | plugins/ffap/ffap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/ffap/ffap.c b/plugins/ffap/ffap.c index ccfa2b2d..c2ba7cbd 100644 --- a/plugins/ffap/ffap.c +++ b/plugins/ffap/ffap.c @@ -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> based on apedec from FFMpeg Copyright (c) 2007 Benjamin Zores <ben@geexbox.org> based upon libdemac from Dave Chapman. @@ -1870,7 +1870,7 @@ static DB_decoder_t plugin = { .plugin.name = "Monkey's Audio (APE) decoder", .plugin.descr = "APE player based on code from libavc and rockbox", .plugin.copyright = - "Copyright (C) 2009-2011 Alexey Yakovenko <waker@users.sourceforge.net>\n" + "Copyright (C) 2009-2012 Alexey Yakovenko <waker@users.sourceforge.net>\n" "\n" "based on apedec from FFMpeg Copyright (c) 2007 Benjamin Zores <ben@geexbox.org>\n" "based upon libdemac from Dave Chapman.\n" |