summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-08-04 17:29:07 +0200
committerBram Moolenaar <Bram@vim.org>2015-08-04 17:29:07 +0200
commit43fe32900c12fea5f9e15ee94ac850e95ec73188 (patch)
treed35370e988189a0dd69cd653601a01cca5917901
parentf7bb86dc593913d055e4cce16cec43f6271adda3 (diff)
patch 7.4.804v7.4.804
Problem: Xxd doesn't have a license notice. Solution: Add license as indicated by Juergen.
-rw-r--r--src/version.c2
-rw-r--r--src/xxd/xxd.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/src/version.c b/src/version.c
index 13dab4d425..5caeaea170 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 804,
+/**/
803,
/**/
802,
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index 8b09c85d6e..c18ad31608 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,