projects / mikachu / openbox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8843a23 b5c9cfd)
Merge branch 'mikabox/actions' into wip/mikabox
authorMikael Magnusson <mikachu@comhem.se>
Sun, 9 Mar 2008 19:39:32 +0000 (20:39 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Sun, 9 Mar 2008 19:39:32 +0000 (20:39 +0100)
1  2 
Makefile.am patch | diff1 | diff2 | blob | history
openbox/actions/all.c patch | diff1 | diff2 | blob | history
openbox/actions/all.h patch | diff1 | diff2 | blob | history

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