diff options
| author | Max Kellermann <max@duempel.org> | 2008-12-21 19:39:08 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2008-12-21 19:39:08 +0100 |
| commit | bc31d7a0ee0a999cdb2d21fb8f0c64ac0a263263 (patch) | |
| tree | 4fe1de8f00a14274b9146d48a4addb18b49acf1b /AUTHORS | |
| parent | a6e981c08d8f37e86bb6040d23486fd18b05d111 (diff) | |
| parent | 143b46caf527ca8e53c186db751930ad1d343b4d (diff) | |
| download | mpd-bc31d7a0ee0a999cdb2d21fb8f0c64ac0a263263.tar.gz mpd-bc31d7a0ee0a999cdb2d21fb8f0c64ac0a263263.tar.xz mpd-bc31d7a0ee0a999cdb2d21fb8f0c64ac0a263263.zip | |
Merge branch 'master' of git://git.musicpd.org/avuton/mpd
Conflicts:
doc/mpdconf.example
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -7,7 +7,7 @@ Avuton Olrich <avuton@gmail.com> Max Kellermann <max@duempel.org> general -José Anarch <anarchsss@gmail.com> +José Anarch <anarchsss@gmail.com> JACK plugin Guus Sliepen <guus@sliepen.eu.org> |