aboutsummaryrefslogtreecommitdiff
path: root/src/merge.h
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2021-03-05 10:34:03 +0100
committerThomas White <taw@physics.org>2021-03-05 10:34:03 +0100
commit40bf0a33309a16a418bc4e46f02c330d0528d368 (patch)
tree8ae00f30af8af6bc8efde3f410aafea4ffb9ee2d /src/merge.h
parentdf44c9e5df7347f850273c9e753ffd5191d6db2b (diff)
Mass update of copyright dates in source code comments
Diffstat (limited to 'src/merge.h')
-rw-r--r--src/merge.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/merge.h b/src/merge.h
index e6684ac6..1e193b62 100644
--- a/src/merge.h
+++ b/src/merge.h
@@ -3,11 +3,11 @@
*
* Parallel weighted merging of intensities
*
- * Copyright © 2012-2020 Deutsches Elektronen-Synchrotron DESY,
+ * Copyright © 2012-2021 Deutsches Elektronen-Synchrotron DESY,
* a research centre of the Helmholtz Association.
*
* Authors:
- * 2010-2015 Thomas White <taw@physics.org>
+ * 2010-2019 Thomas White <taw@physics.org>
*
* This file is part of CrystFEL.
*