summaryrefslogtreecommitdiffstats
path: root/merge.cc
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 11:42:32 +0000
committerDaniel Baumann <mail@daniel-baumann.ch>2015-11-07 11:42:32 +0000
commitbcbac5cac5f6194d9fa5fbc16e0a4490e7e23520 (patch)
tree87adc0b5058585d2c7529c151321af22097e2fd2 /merge.cc
parentAdding upstream version 1.15~pre1. (diff)
downloadlziprecover-bcbac5cac5f6194d9fa5fbc16e0a4490e7e23520.tar.xz
lziprecover-bcbac5cac5f6194d9fa5fbc16e0a4490e7e23520.zip
Adding upstream version 1.15~rc1.upstream/1.15_rc1
Signed-off-by: Daniel Baumann <mail@daniel-baumann.ch>
Diffstat (limited to 'merge.cc')
-rw-r--r--merge.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge.cc b/merge.cc
index c216870..aaccb56 100644
--- a/merge.cc
+++ b/merge.cc
@@ -1,4 +1,4 @@
-/* Lziprecover - Data recovery tool for lzipped files
+/* Lziprecover - Data recovery tool for lzip files
Copyright (C) 2009, 2010, 2011, 2012, 2013 Antonio Diaz Diaz.
This program is free software: you can redistribute it and/or modify