Code

Merge branch 'master' of git://git.musicpd.org/patrick/ncmpc
authorMax Kellermann <max@duempel.org>
Mon, 30 Mar 2009 17:34:01 +0000 (19:34 +0200)
committerMax Kellermann <max@duempel.org>
Mon, 30 Mar 2009 17:34:01 +0000 (19:34 +0200)
1  2 
src/options.c
src/screen_help.c

diff --cc src/options.c
Simple merge
Simple merge