aboutsummaryrefslogtreecommitdiffstats
path: root/COPYING
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2014-06-13 12:57:27 +0200
committerMattias Andrée <maandree@operamail.com>2014-06-13 12:57:27 +0200
commitbd2dfeee45a8a50031cc1889fdc7b9184da0b9b9 (patch)
tree1c1fe21e32cd69835f8f233e04b19be1298597b2 /COPYING
parentrcfile works (diff)
parentm (diff)
downloadpytagomacs-bd2dfeee45a8a50031cc1889fdc7b9184da0b9b9.tar.gz
pytagomacs-bd2dfeee45a8a50031cc1889fdc7b9184da0b9b9.tar.bz2
pytagomacs-bd2dfeee45a8a50031cc1889fdc7b9184da0b9b9.tar.xz
merge the two branches
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to '')
-rw-r--r--COPYING2
1 files changed, 1 insertions, 1 deletions
diff --git a/COPYING b/COPYING
index 2a5cf61..65e240b 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
pytagomacs – An Emacs like key–value editor library for Python
-Copyright © 2013 Mattias Andrée (maandree@member.fsf.org)
+Copyright © 2013, 2014 Mattias Andrée (maandree@member.fsf.org)
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by