projects / mikachu / openbox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f857b0e 573bbb0)
Merge branch 'backport' into work
authorMikael Magnusson <mikachu@comhem.se>
Thu, 28 Feb 2008 05:20:50 +0000 (06:20 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Thu, 28 Feb 2008 05:20:50 +0000 (06:20 +0100)
Conflicts:

Makefile.am

1  2 
Makefile.am patch | diff1 | diff2 | blob | history
openbox/actions/execute.c patch | diff1 | diff2 | blob | history
openbox/actions/exit.c patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
index ec6157b276998e83c1026c290d6561ce3a01e36e,0b7e58787077c773f281e3e9def263390130d975..6e8cb232a54dd0c78c3325c2aa5a0231fa50cc8f
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -457,6 -447,8 +459,7 @@@ nodist_xsessions_DATA = 
        data/xsession/openbox-kde.desktop
  
  dist_noinst_DATA = \
 -      version.h.in \
+       data/autostart.sh.in \
        data/rc.xsd \
        data/menu.xsd \
        data/xsession/openbox.desktop.in \
diff --cc openbox/actions/execute.c
Simple merge
diff --cc openbox/actions/exit.c
Simple merge
Openbox Window Manager