Michael Stapelberg c7ea8c42b6 Merge branch 'master' into next ... Conflicts: debian/changelog		2012-01-27 19:34:15 +00:00
..
patches	update i3-sensible-* (Thanks Han)	2011-12-29 00:01:49 +01:00
changelog	Merge branch 'master' into next	2012-01-27 19:34:15 +00:00
compat	Bump dh compat to 7, simplify debian/rules.	2011-10-23 11:07:22 +01:00
control	debian: make meta-package i3 depend on the precise version of i3-wm (Thanks Merovius)	2011-11-16 20:10:48 +00:00
copyright	debian: bump standards-version, update website	2011-07-31 22:42:39 +02:00
i3-wm.doc-base	debian: Add i3-wm.doc-base	2009-11-23 21:50:01 +01:00
i3-wm.docs	debian: include PNGs of the userguide in docs	2011-11-15 23:44:14 +00:00
i3-wm.manpages	debian: add new manpages to i3-wm.manpages	2011-11-11 22:37:01 +00:00
i3-wm.wm	debian: add i3-wm.wm for dh_installwm to repository	2011-07-23 22:24:16 +02:00
rules	debian: add support for dpkg-buildpackage -j parallelism	2012-01-23 22:22:24 +00:00
watch	debian: bump standards-version, update website	2011-07-31 22:42:39 +02:00