From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 4 Jan 2014 11:20:12 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.8~169
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a32b6da71249a71487b5708e0f043e5cb3b146c1;p=i3%2Fi3

Merge branch 'master' into next
---

a32b6da71249a71487b5708e0f043e5cb3b146c1
diff --cc Makefile
index 935d1938,ff10dcb5..0e2e42db
--- a/Makefile
+++ b/Makefile
@@@ -30,7 -30,7 +30,7 @@@ dist: distclea
  	[ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION}
  	[ ! -e i3-${VERSION}.tar.bz2 ] || rm i3-${VERSION}.tar.bz2
  	mkdir i3-${VERSION}
- 	cp i3-migrate-config-to-v4 i3-save-tree generate-command-parser.pl i3-sensible-* i3-dmenu-desktop i3.config.keycodes DEPENDS LICENSE PACKAGE-MAINTAINER RELEASE-NOTES-${VERSION} i3.config i3.xsession.desktop i3.applications.desktop pseudo-doc.doxygen common.mk Makefile i3-${VERSION}
 -	cp i3-migrate-config-to-v4 generate-command-parser.pl i3-sensible-* i3-dmenu-desktop i3.config.keycodes DEPENDS LICENSE PACKAGE-MAINTAINER RELEASE-NOTES-${VERSION} i3.config i3.xsession.desktop i3-with-shmlog.xsession.desktop i3.applications.desktop pseudo-doc.doxygen common.mk Makefile i3-${VERSION}
++	cp i3-migrate-config-to-v4 i3-save-tree generate-command-parser.pl i3-sensible-* i3-dmenu-desktop i3.config.keycodes DEPENDS LICENSE PACKAGE-MAINTAINER RELEASE-NOTES-${VERSION} i3.config i3.xsession.desktop i3-with-shmlog.xsession.desktop i3.applications.desktop pseudo-doc.doxygen common.mk Makefile i3-${VERSION}
  	cp -r src libi3 i3-msg i3-nagbar i3-config-wizard i3bar i3-dump-log yajl-fallback include man parser-specs testcases i3-${VERSION}
  	# Only copy toplevel documentation (important stuff)
  	mkdir i3-${VERSION}/docs