]> icculus.org git repositories - mikachu/openbox.git/commit
Merge branch 'mikabox/personal' into wip/mikabox
authorMikael Magnusson <mikachu@comhem.se>
Sat, 8 Mar 2008 16:29:40 +0000 (17:29 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Sat, 8 Mar 2008 16:29:40 +0000 (17:29 +0100)
commita1ebaf42a5124954e0a33133b2fb5f44113258ce
tree5bb2e6d72dc7c48c4cb59b5fdcad2836e7a735a4
parent7e03cd8790bbf6f1fc3583247b3952d5c674488c
parent598f11ce7c91f5db11f1edb4ead0cc1bd8f489f9
Merge branch 'mikabox/personal' into wip/mikabox

Conflicts:

obt/prop.c
obt/prop.c
obt/prop.h
openbox/client.c
openbox/client_menu.c
openbox/event.c