summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2015-07-09 13:22:39 +0100
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2015-07-09 13:22:39 +0100
commit3dedf639fa39955f2bef27db41c745acc0324056 (patch)
treeab136b1297b9b3817df54cc746bd59a7a31345e8
parent7a19a302773fc6c9e5911f53d36cc905f08bd531 (diff)
downloadlorry-3dedf639fa39955f2bef27db41c745acc0324056.tar.gz
Add note about license of fast-import frontends
Also update copyright Change-Id: Iff42a32048482520cee695bc1262990f5989ce63
-rw-r--r--README14
-rwxr-xr-xlorry2
2 files changed, 13 insertions, 3 deletions
diff --git a/README b/README
index 173114c..c9c116e 100644
--- a/README
+++ b/README
@@ -219,8 +219,8 @@ Tips
Legal stuff
-----------
-Copyright (C) 2013 Codethink Limited
-
+Copyright (C) 2013-2015 Codethink Limited
+
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
the Free Software Foundation; version 2 of the License.
@@ -234,3 +234,13 @@ You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+We carry 2 slightly modified git-fast-import frontends:
+
+lorry.tar-importer which is based on
+https://github.com/git/git/blob/master/contrib/fast-import/import-tars.perl
+
+and lorry.zip-importer, which is based on
+https://github.com/git/git/blob/master/contrib/fast-import/import-zips.py
+
+all parts of git are under a GPLv2 compatible license,
+see the git source code for more details.
diff --git a/lorry b/lorry
index da1e556..aa87d52 100755
--- a/lorry
+++ b/lorry
@@ -1,5 +1,5 @@
#!/usr/bin/python
-# Copyright (C) 2013-2014 Codethink Limited
+# Copyright (C) 2013-2015 Codethink Limited
#
# 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