Merge branch 'master' into 3.4
authorDana Jansens <danakj@orodu.net>
Sat, 14 Jul 2007 13:09:14 +0000 (09:09 -0400)
committerDana Jansens <danakj@orodu.net>
Sat, 14 Jul 2007 13:09:14 +0000 (09:09 -0400)
commit936839eab1de283321384512beccf55dcbff9f4a
treecb1ee5669cfffa83cfda5c0af30720af00c0a7a6
parentd7fd783130db9426b287d5e41370d6a616df0766
parentb580cf99ddcff73c366061e157a9d1dff3cba21b
Merge branch 'master' into 3.4
Makefile.am
openbox/actions/all.c
openbox/actions/all.h
openbox/actions/cyclewindows.c
openbox/actions/desktop.c
openbox/actions/directionalwindows.c
openbox/actions/layer.c
openbox/actions/maximize.c
openbox/config.c