merge xim -> default
authorConnor Lane Smith <cls@lubutu.com>
Mon, 17 Oct 2011 09:11:48 +0000 (10:11 +0100)
committerConnor Lane Smith <cls@lubutu.com>
Mon, 17 Oct 2011 09:11:48 +0000 (10:11 +0100)
1  2 
dmenu.c

diff --cc dmenu.c
Simple merge