Merge branch 'mikabox/actions' into wip/mikabox
authorMikael Magnusson <mikachu@comhem.se>
Sat, 8 Mar 2008 16:29:13 +0000 (17:29 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Sat, 8 Mar 2008 16:29:13 +0000 (17:29 +0100)
commit9d87ece4d961899bbaa982c2669c542cc6d2b963
tree29290ff6e4e4d0a58652cb5a70924c2325b63dfc
parenta04a1eb4f775c6322e13ef22997f6b7da67b2795
parent3192461b55600552cba2e6fa21cd689c598f7119
Merge branch 'mikabox/actions' into wip/mikabox

Conflicts:

Makefile.am
openbox/client.c
po/POTFILES.in
Makefile.am
openbox/actions.c
openbox/actions/all.c
openbox/actions/all.h
openbox/actions/desktop.c
openbox/client.c
openbox/client_menu.c
openbox/event.c
po/POTFILES.in