From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 4 Aug 2015 15:29:07 +0000 (+0200)
Subject: patch 7.4.804
X-Git-Tag: v7.4.804
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43fe32900c12fea5f9e15ee94ac850e95ec73188;p=vim

patch 7.4.804
Problem:    Xxd doesn't have a license notice.
Solution:   Add license as indicated by Juergen.
---

diff --git a/src/version.c b/src/version.c
index 13dab4d42..5caeaea17 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    804,
 /**/
     803,
 /**/
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index 8b09c85d6..c18ad3160 100644
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -55,6 +55,9 @@
  *
  * (c) 1990-1998 by Juergen Weigert (jnweiger@informatik.uni-erlangen.de)
  *
+ * I hereby grant permission to distribute and use xxd
+ * under X11-MIT or GPL-2.0 (at the user's choice).
+ *
  * Small changes made afterwards by Bram Moolenaar et al.
  *
  * Distribute freely and credit me,