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

projects / mikachu / openbox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d235782 f4534e4)

author	Mikael Magnusson <mikachu@gmail.com>
	Wed, 17 Apr 2013 11:03:53 +0000 (13:03 +0200)
committer	Mikael Magnusson <mikachu@gmail.com>
	Wed, 17 Apr 2013 11:03:53 +0000 (13:03 +0200)
commit	7cd370e5be6dab01b32a5af6b779dcf7a836c250
tree	4d6da89166ea06927b343b9b6a1c9ff565e5dc87	tree \| snapshot
parent	d23578286e21b8915893ff1f02ae7465b2bd3493	commit \| diff
parent	f4534e435b5ddbc7adef3ddb2a6abb25ccb0c81b	commit \| diff

Merge branch 'mikabox/crap' into wip/mikabox

Conflicts:
openbox/actions/all.c
openbox/actions/all.h
openbox/client.c
openbox/config.c
openbox/place.c
openbox/stacking.c

Makefile.am	diff1 \|	diff2 \|	blob \| history
openbox/actions/all.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/all.h	diff1 \|	diff2 \|	blob \| history
openbox/client.c	diff1 \|	diff2 \|	blob \| history
openbox/config.c	diff1 \|	diff2 \|	blob \| history
openbox/config.h	diff1 \|	diff2 \|	blob \| history
openbox/openbox.c	diff1 \|	diff2 \|	blob \| history
openbox/place.h	diff1 \|	diff2 \|	blob \| history
openbox/screen.c	diff1 \|	diff2 \|	blob \| history
tests/icons.c	diff1 \|	diff2 \|	blob \| history

Openbox Window Manager