Merge remote-tracking branch 'dana/work' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Sun, 11 Aug 2013 09:55:02 +0000 (11:55 +0200)
committerMikael Magnusson <mikachu@gmail.com>
Sun, 11 Aug 2013 09:55:02 +0000 (11:55 +0200)
commit9483d326bb6691dbf356ebb595cabb8ab1ca74d4
tree73943d655e7200f9cc75d6590fd47adf773df648
parenta3716cc74ae49d59c3b5d9f93280b84f2232221e
parent16c0fb84bc8c4b2547850148a60f3c82092ba104
Merge remote-tracking branch 'dana/work' into wip/mikabox

Conflicts:
openbox/place.c
openbox/place_overlap.c
Makefile.am
obrender/render.h
openbox/actions/moveresizeto.c
openbox/actions/resizerelative.c
openbox/config.c
openbox/event.c
openbox/moveresize.c
openbox/openbox.c