Merge branch 'work' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Fri, 20 Feb 2009 16:45:24 +0000 (17:45 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Fri, 20 Feb 2009 16:45:24 +0000 (17:45 +0100)
commit8f4b12123ba531dd55c8f0b1d75ce501c7cd512d
tree43e4db6a5ff5d9561ee62c94abe561986e3237ff
parentb306298558823167bc4e15d4def8ff21381135fb
parentd69530a45a42efab0d34dcdb35b0f6fc887dafac
Merge branch 'work' into wip/mikabox
data/rc.xml
openbox/config.c
openbox/openbox.c