Merge branch 'm4/buttons'
authorMikael Magnusson <mikachu@gmail.com>
Tue, 2 Aug 2011 19:01:09 +0000 (21:01 +0200)
committerMikael Magnusson <mikachu@gmail.com>
Tue, 2 Aug 2011 19:01:09 +0000 (21:01 +0200)
commit2ed0b291951478798efc2d7ac41b289125a12a0b
tree6505b5aa3ed1a82c6dfa6b0d9b8f339709887007
parentba19d9df446da62c2642725d1e4beae56f82874e
parentd162451a0113da1e012e007f848e38f07348d9d2
Merge branch 'm4/buttons'
Makefile.am
obrender/render.h
openbox/prompt.c