Merge branch 'mikabox/maybe' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Sun, 8 Feb 2009 07:52:07 +0000 (08:52 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Sun, 8 Feb 2009 07:52:07 +0000 (08:52 +0100)
commit56c80ed489ab78a4c254d9c0802959fa41a41f2b
treea381a61b4e42f4d560c5d7ddb55c6fe9d3efb633
parentc422b8a11557400a4514b5d1cf66e7f8ab029d2e
parente8b1607346d9547c46a0cdc4477a5c9cc20c8755
Merge branch 'mikabox/maybe' into wip/mikabox

Conflicts:
openbox/client_list_combined_menu.c
openbox/client_list_combined_menu.c
openbox/menu.h
openbox/menuframe.c