Merge branch 'mikabox/actions' into wip/mikabox
authorMikael Magnusson <mikachu@comhem.se>
Sun, 9 Mar 2008 19:39:32 +0000 (20:39 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Sun, 9 Mar 2008 19:39:32 +0000 (20:39 +0100)
commitdf7a496067cc5e6a63b0ffe153ab70ea0ef1dc08
treeca275d5eae82e07639939229b1615009a6d1f30c
parent8843a2311891a9fd9accb4be47f610606ca9e477
parentb5c9cfd1ff151fda6f8f5c2ed9a8214e22550837
Merge branch 'mikabox/actions' into wip/mikabox
Makefile.am
openbox/actions/all.c
openbox/actions/all.h