From: Mikael Magnusson <mikachu@comhem.se>
Date: Thu, 28 Feb 2008 05:20:50 +0000 (+0100)
Subject: Merge branch 'backport' into work
X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=commitdiff_plain;h=163950b23bf796a39870044417ca54d667b6b470

Merge branch 'backport' into work

Conflicts:

	Makefile.am
---

163950b23bf796a39870044417ca54d667b6b470
diff --cc Makefile.am
index ec6157b2,0b7e5878..6e8cb232
--- a/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 \