summaryrefslogtreecommitdiffstats
path: root/merge.cc
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 11:47:57 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 11:47:57 +0000
commit6867e4e2ba8cd163e64105e0492726322f8704d2 (patch)
tree4a22cc7f0e52f52859de2236c625a7ce11d3c2aa /merge.cc
parentAdding debian version 1.16~pre2-1. (diff)
downloadlziprecover-6867e4e2ba8cd163e64105e0492726322f8704d2.tar.xz
lziprecover-6867e4e2ba8cd163e64105e0492726322f8704d2.zip
Merging upstream version 1.16~rc1.
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to '')
-rw-r--r--merge.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge.cc b/merge.cc
index 95b9318..113b50f 100644
--- a/merge.cc
+++ b/merge.cc
@@ -3,7 +3,7 @@
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, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,