merge r7116-7120 from trunk
authorDana Jansens <danakj@orodu.net>
Wed, 30 May 2007 20:38:00 +0000 (20:38 +0000)
committerDana Jansens <danakj@orodu.net>
Wed, 30 May 2007 20:38:00 +0000 (20:38 +0000)
commit69071f8ca44520551187146a32ba25fd27308047
tree197372c2f6c0bb50b8ac1db49f0cbfc3f6f95664
parentee55e0b1d8f58392a285c9cb5b8acc58bd3ac792
merge r7116-7120 from trunk
openbox/menu.c
tests/.svnignore
tests/skiptaskbar.c
tests/skiptaskbar2.c [new file with mode: 0644]