]> icculus.org git repositories - mikachu/openbox.git/commit
Merge branch 'mikabox/crap' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Wed, 17 Apr 2013 11:03:53 +0000 (13:03 +0200)
committerMikael Magnusson <mikachu@gmail.com>
Wed, 17 Apr 2013 11:03:53 +0000 (13:03 +0200)
commit7cd370e5be6dab01b32a5af6b779dcf7a836c250
tree4d6da89166ea06927b343b9b6a1c9ff565e5dc87
parentd23578286e21b8915893ff1f02ae7465b2bd3493
parentf4534e435b5ddbc7adef3ddb2a6abb25ccb0c81b
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
openbox/actions/all.c
openbox/actions/all.h
openbox/client.c
openbox/config.c
openbox/config.h
openbox/openbox.c
openbox/place.h
openbox/screen.c
tests/icons.c