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)
Conflicts:
openbox/place.c
openbox/place_overlap.c

1  2 
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

diff --cc Makefile.am
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc openbox/event.c
Simple merge
Simple merge
Simple merge