You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by rj...@apache.org on 2015/01/01 13:39:05 UTC
svn commit: r1648833 - in /apr/apr/branches/1.4.x: ./ NOTICE
include/apr_version.h
Author: rjung
Date: Thu Jan 1 12:39:04 2015
New Revision: 1648833
URL: http://svn.apache.org/r1648833
Log:
Happy New Year 2015
Backport of r1648830 from trunk
resp. r1648831 from 1.6.x
resp. r1648832 from 1.5.x.
Modified:
apr/apr/branches/1.4.x/ (props changed)
apr/apr/branches/1.4.x/NOTICE
apr/apr/branches/1.4.x/include/apr_version.h
Propchange: apr/apr/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 1 12:39:04 2015
@@ -1,2 +1,3 @@
-/apr/apr/branches/1.5.x:1083592,1183724,1240474,1343250,1425357,1575517,1626565,1626574-1626575
-/apr/apr/trunk:733052,739635,747990,748361,748371,748565,748888,748902,748988,749810,760443,782838,783398,783958,784633,784773,788588,793192-793193,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,835607,905040,908427,910419,917837-917838,925965,979891,983618,990435,1044440,1044447,1072165,1078845,1103310,1183683,1183685-1183686,1183688,1183698,1213382,1236970,1237078,1237507,1240472,1340286,1340288,1340470,1341193,1341196,1343233,1343243,1367050,1368819,1370494,1372018,1372022,1389077,1400200,1405985,1406690,1420106,1420109,1425356,1438958,1442903,1449568,1456418,1460179,1460399,1460405,1462738,1462813,1470186,1470348,1475509,1478905,1481262,1481265,1487796,1502804,1516261,1520879,1550907,1559873,1559975,1626564
+/apr/apr/branches/1.5.x:1083592,1183724,1240474,1343250,1425357,1575517,1626565,1626574-1626575,1648832
+/apr/apr/branches/1.6.x:1648831
+/apr/apr/trunk:733052,739635,747990,748361,748371,748565,748888,748902,748988,749810,760443,782838,783398,783958,784633,784773,788588,793192-793193,794118,794485,795267,799497,800627,809745,809854,810472,811455,813063,821306,829490,831641,835607,905040,908427,910419,917837-917838,925965,979891,983618,990435,1044440,1044447,1072165,1078845,1103310,1183683,1183685-1183686,1183688,1183698,1213382,1236970,1237078,1237507,1240472,1340286,1340288,1340470,1341193,1341196,1343233,1343243,1367050,1368819,1370494,1372018,1372022,1389077,1400200,1405985,1406690,1420106,1420109,1425356,1438958,1442903,1449568,1456418,1460179,1460399,1460405,1462738,1462813,1470186,1470348,1475509,1478905,1481262,1481265,1487796,1502804,1516261,1520879,1550907,1559873,1559975,1626564,1648830
Modified: apr/apr/branches/1.4.x/NOTICE
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/NOTICE?rev=1648833&r1=1648832&r2=1648833&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/NOTICE (original)
+++ apr/apr/branches/1.4.x/NOTICE Thu Jan 1 12:39:04 2015
@@ -1,5 +1,5 @@
Apache Portable Runtime
-Copyright (c) 2000-2014 The Apache Software Foundation.
+Copyright (c) 2000-2015 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: apr/apr/branches/1.4.x/include/apr_version.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/include/apr_version.h?rev=1648833&r1=1648832&r2=1648833&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/include/apr_version.h (original)
+++ apr/apr/branches/1.4.x/include/apr_version.h Thu Jan 1 12:39:04 2015
@@ -38,7 +38,7 @@
*/
-#define APR_COPYRIGHT "Copyright (c) 2000-2014 The Apache Software " \
+#define APR_COPYRIGHT "Copyright (c) 2000-2015 The Apache Software " \
"Foundation or its licensors, as applicable."
/* The numeric compile-time version constants. These constants are the