summaryrefslogtreecommitdiff
path: root/src
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
commitb6addf1275d1d025c437bc9b418a22047d561e72 (patch)
tree368cd32475ebc1689c131f4e98cffec4964baa5c /src
parent28ceb02702fe37fcdbb779b259bf06cc88beca9f (diff)
downloadvim-b6addf1275d1d025c437bc9b418a22047d561e72.tar.gz
patch 7.4.804v7.4.804v7-4-804
Problem: Xxd doesn't have a license notice. Solution: Add license as indicated by Juergen.
Diffstat (limited to 'src')
-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 13dab4d4..5caeaea1 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 8b09c85d..c18ad316 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,