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
openbox/actions/execute.c
openbox/actions/exit.c

diff --cc 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 \
Simple merge
Simple merge