Merge branch 'master' into next

[i3/i3] / debian / patches / manpage-x-terminal-emulator.patch

diff --git a/debian/patches/manpage-x-terminal-emulator.patch b/debian/patches/manpage-x-terminal-emulator.patch
index ed6cb465f542b1c1cf5b764513c76d56744f0be4..17b8ee4cb9ba7522e3e38f717b021ca1c4363a3d 100644 (file)
--- a/debian/patches/manpage-x-terminal-emulator.patch
+++ b/debian/patches/manpage-x-terminal-emulator.patch
@@ -1,3 +1,11 @@
+Description: list x-terminal-emulator as one of i3-sensible-terminal’s choices
+Author: Michael Stapelberg <stapelberg@debian.org>
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2011-12-28
+
+---
+
 Index: i3-4.1.1/man/i3-sensible-terminal.man
 ===================================================================
 --- i3-4.1.1.orig/man/i3-sensible-terminal.man 2011-12-28 23:56:55.487581000 +0100