git.openbox.org Git - mikachu/openbox.git/commit

projects / mikachu / openbox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a3716cc 16c0fb8)

author	Mikael Magnusson <mikachu@gmail.com>
	Sun, 11 Aug 2013 09:55:02 +0000 (11:55 +0200)
committer	Mikael Magnusson <mikachu@gmail.com>
	Sun, 11 Aug 2013 09:55:02 +0000 (11:55 +0200)
commit	9483d326bb6691dbf356ebb595cabb8ab1ca74d4
tree	73943d655e7200f9cc75d6590fd47adf773df648	tree \| snapshot
parent	a3716cc74ae49d59c3b5d9f93280b84f2232221e	commit \| diff
parent	16c0fb84bc8c4b2547850148a60f3c82092ba104	commit \| diff

Merge remote-tracking branch 'dana/work' into wip/mikabox

Conflicts:
openbox/place.c
openbox/place_overlap.c

Makefile.am	diff1 \|	diff2 \|	blob \| history
obrender/render.h	diff1 \|	diff2 \|	blob \| history
openbox/actions/moveresizeto.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/resizerelative.c	diff1 \|	diff2 \|	blob \| history
openbox/config.c	diff1 \|	diff2 \|	blob \| history
openbox/event.c	diff1 \|	diff2 \|	blob \| history
openbox/moveresize.c	diff1 \|	diff2 \|	blob \| history
openbox/openbox.c	diff1 \|	diff2 \|	blob \| history

Openbox Window Manager