Author: julianfoad
Date: Fri Jan 4 11:38:50 2019
New Revision: 1850352
URL: http://svn.apache.org/viewvc?rev=1850352&view=rev
Log:
Merge r1850348 (bump the copyright year) onto 1.11.x.
Modified:
subversion/branches/1.11.x/ (props changed)
subversion/branches/1.11.x/NOTICE
subversion/branches/1.11.x/subversion/libsvn_subr/version.c
Propchange: subversion/branches/1.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 4 11:38:50 2019
@@ -100,4 +100,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1844987,1845204,1845261,1845408,1845555-1845556,1845559,1845577,1846299,1846403,1846406,1846704,1847181-1847182,1847188,1847264,1847572,1847596
+/subversion/trunk:1840990-1840991,1840995,1840997,1841059,1841079,1841091,1841098,1841136,1841180,1841272,1841481,1841524-1841525,1841567,1841600-1841602,1841606,1841719,1841725,1841731,1841736,1841742-1841743,1841753-1841754,1841822,1841850,1841867,1842090,1842222-1842223,1842334,1842814,1842827,1842829,1842877,1843888,1844882,1844987,1845204,1845261,1845408,1845555-1845556,1845559,1845577,1846299,1846403,1846406,1846704,1847181-1847182,1847188,1847264,1847572,1847596,1850348
Modified: subversion/branches/1.11.x/NOTICE
URL:
http://svn.apache.org/viewvc/subversion/branches/1.11.x/NOTICE?rev=1850352&r1=1850351&r2=1850352&view=diff
==============================================================================
--- subversion/branches/1.11.x/NOTICE (original)
+++ subversion/branches/1.11.x/NOTICE Fri Jan 4 11:38:50 2019
@@ -1,5 +1,5 @@
Apache Subversion
-Copyright 2018 The Apache Software Foundation
+Copyright 2019 The Apache Software Foundation
This product includes software developed by many people, and distributed
under Contributor License Agreements to The Apache Software Foundation
Modified: subversion/branches/1.11.x/subversion/libsvn_subr/version.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.11.x/subversion/libsvn_subr/version.c?rev=1850352&r1=1850351&r2=1850352&view=diff
==============================================================================
--- subversion/branches/1.11.x/subversion/libsvn_subr/version.c (original)
+++ subversion/branches/1.11.x/subversion/libsvn_subr/version.c Fri Jan 4
11:38:50 2019
@@ -143,7 +143,7 @@ svn_version_extended(svn_boolean_t verbo
info->build_time = __TIME__;
info->build_host = SVN_BUILD_HOST;
info->copyright = apr_pstrdup
- (pool, _("Copyright (C) 2018 The Apache Software Foundation.\n"
+ (pool, _("Copyright (C) 2019 The Apache Software Foundation.\n"
"This software consists of contributions made by many people;\n"
"see the NOTICE file for more information.\n"
"Subversion is open source software, see "
