Author: svn-role
Date: Fri Mar 28 04:01:18 2014
New Revision: 1582590
URL: http://svn.apache.org/r1582590
Log:
Merge r1555403 from trunk:
* r1555403
Update copyright years in NOTICE and subversion/libsvn_subr/version.c.
Justification:
We're not in 2013 any more.
Votes:
+1: brane, ivan, rhuijben
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/NOTICE
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/libsvn_subr/version.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1555403
Modified: subversion/branches/1.8.x/NOTICE
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/NOTICE?rev=1582590&r1=1582589&r2=1582590&view=diff
==============================================================================
--- subversion/branches/1.8.x/NOTICE (original)
+++ subversion/branches/1.8.x/NOTICE Fri Mar 28 04:01:18 2014
@@ -1,5 +1,5 @@
Apache Subversion
-Copyright 2013 The Apache Software Foundation
+Copyright 2014 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.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1582590&r1=1582589&r2=1582590&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Mar 28 04:01:18 2014
@@ -323,13 +323,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1555403
- Update copyright years in NOTICE and subversion/libsvn_subr/version.c.
- Justification:
- We're not in 2013 any more.
- Votes:
- +1: brane, ivan, rhuijben
-
* r1577200
Fix libmagic detection with custom LDFLAGS.
Justification:
Modified: subversion/branches/1.8.x/subversion/libsvn_subr/version.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_subr/version.c?rev=1582590&r1=1582589&r2=1582590&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_subr/version.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_subr/version.c Fri Mar 28
04:01:18 2014
@@ -136,7 +136,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) 2013 The Apache Software Foundation.\n"
+ (pool, _("Copyright (C) 2014 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 "
