diff options
author | Ben Brown <ben.brown@codethink.co.uk> | 2020-07-15 15:58:54 +0000 |
---|---|---|
committer | Ben Brown <ben.brown@codethink.co.uk> | 2020-07-15 15:58:54 +0000 |
commit | 03ae8a519f7d2af7907d7c725c0fdaebce827d19 (patch) | |
tree | 483fed2d654fd179e42b35e267e32da49c89db3e /LICENSE | |
parent | a90b02e5e0fbfac1215c4839875552d43cf245fc (diff) | |
parent | 05f50af6b44ec365bfa59024426c38ba5093883e (diff) | |
download | lorry-03ae8a519f7d2af7907d7c725c0fdaebce827d19.tar.gz |
Merge branch 'bwh/fix-copyright-notices' into 'master'
Fix copyright notices
See merge request CodethinkLabs/lorry/lorry!10
Diffstat (limited to 'LICENSE')
-rw-r--r-- | LICENSE | 14 |
1 files changed, 2 insertions, 12 deletions
@@ -1,4 +1,5 @@ -Copyright (C) 2013-2020 Codethink Limited +Copyright 2005-2015 Linus Torvalds and others +Copyright (C) 2011-2020 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 @@ -12,14 +13,3 @@ GNU General Public License for more details. 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. |