projects / mikachu / openbox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: badf4e5 bec982e)
Merge branch 'mikabox/actions' into wip/mikabox
authorMikael Magnusson <mikachu@comhem.se>
Sat, 8 Mar 2008 17:36:47 +0000 (18:36 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Sat, 8 Mar 2008 17:36:47 +0000 (18:36 +0100)
Conflicts:

openbox/actions/all.c

1  2 
openbox/actions/all.c patch | diff1 | diff2 | blob | history

diff --cc openbox/actions/all.c
Simple merge
Openbox Window Manager