From f3791144ef4cad3a5691649982001582f27828ff Mon Sep 17 00:00:00 2001 From: Abogical Date: Tue, 2 Jan 2018 00:26:57 +0200 Subject: [PATCH 1/2] Happy new year! --- LICENSE | 2 +- docs/conf.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 1928806f0..051e44c63 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2015-2017 The Borg Collective (see AUTHORS file) +Copyright (C) 2015-2018 The Borg Collective (see AUTHORS file) Copyright (C) 2010-2014 Jonas Borgström All rights reserved. diff --git a/docs/conf.py b/docs/conf.py index 283a2c7ac..5d672c56a 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -42,7 +42,7 @@ master_doc = 'index' # General information about the project. project = 'Borg - Deduplicating Archiver' -copyright = '2010-2014 Jonas Borgström, 2015-2017 The Borg Collective (see AUTHORS file)' +copyright = '2010-2014 Jonas Borgström, 2015-2018 The Borg Collective (see AUTHORS file)' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the From 46692c139af34b740b6e32469944e97edd0df1c2 Mon Sep 17 00:00:00 2001 From: Abogical Date: Tue, 2 Jan 2018 16:59:01 +0200 Subject: [PATCH 2/2] Revert copyright year change in shellpattern --- src/borg/shellpattern.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/borg/shellpattern.py b/src/borg/shellpattern.py index 7c3d76b21..f71c3b9ce 100644 --- a/src/borg/shellpattern.py +++ b/src/borg/shellpattern.py @@ -15,7 +15,7 @@ def translate(pat, match_end=r"\Z"): This function is derived from the "fnmatch" module distributed with the Python standard library. - Copyright (C) 2001-2017 Python Software Foundation. All rights reserved. + Copyright (C) 2001-2016 Python Software Foundation. All rights reserved. TODO: support {alt1,alt2} shell-style alternatives