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:45:01 UTC
svn commit: r1648835 - in /apr/apr-util/branches/1.4.x: ./ NOTICE
include/apu_version.h
Author: rjung
Date: Thu Jan 1 12:45:00 2015
New Revision: 1648835
URL: http://svn.apache.org/r1648835
Log:
Happy New Year 2015
Backport of r1648830 from APR trunk
resp. r1648834 from APU 1.5.x.
Modified:
apr/apr-util/branches/1.4.x/ (props changed)
apr/apr-util/branches/1.4.x/NOTICE
apr/apr-util/branches/1.4.x/include/apu_version.h
Propchange: apr/apr-util/branches/1.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 1 12:45:00 2015
@@ -1,4 +1,4 @@
-/apr/apr/trunk:779396,781403,781409,784519,784592,789965,794508,917837-917838,982408-982409,1127648-1127649,1187984,1207704,1210524,1211987,1214516,1308087,1308131,1308318,1346865,1361811,1362241,1369681,1370626,1390461,1390477,1402870,1402897
+/apr/apr/trunk:779396,781403,781409,784519,784592,789965,794508,917837-917838,982408-982409,1127648-1127649,1187984,1207704,1210524,1211987,1214516,1308087,1308131,1308318,1346865,1361811,1362241,1369681,1370626,1390461,1390477,1402870,1402897,1648830
/apr/apr-util/branches/1.3.x:896410,979221-979222,979232,1001059,1002632,1002648,1002733,1003214,1003255,1003358,1003370,1003376,1003602,1005956,1005962,1006017,1006137,1154885
-/apr/apr-util/branches/1.5.x:1002504,1002584-1002585,1002620,1002622-1002623,1002628,1207683,1207690,1207707,1209594,1210530,1212347,1361814,1362243,1370503,1575514-1575515
+/apr/apr-util/branches/1.5.x:1002504,1002584-1002585,1002620,1002622-1002623,1002628,1207683,1207690,1207707,1209594,1210530,1212347,1361814,1362243,1370503,1575514-1575515,1648834
/apr/apr-util/trunk:731033-731034,731225,731236,731291,731293,731379,743986,744009,745771,747612,747623,747630
Modified: apr/apr-util/branches/1.4.x/NOTICE
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/NOTICE?rev=1648835&r1=1648834&r2=1648835&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/NOTICE (original)
+++ apr/apr-util/branches/1.4.x/NOTICE Thu Jan 1 12:45:00 2015
@@ -1,5 +1,5 @@
Apache Portable Runtime Utility Library
-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-util/branches/1.4.x/include/apu_version.h
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.4.x/include/apu_version.h?rev=1648835&r1=1648834&r2=1648835&view=diff
==============================================================================
--- apr/apr-util/branches/1.4.x/include/apu_version.h (original)
+++ apr/apr-util/branches/1.4.x/include/apu_version.h Thu Jan 1 12:45:00 2015
@@ -38,7 +38,7 @@
*/
-#define APU_COPYRIGHT "Copyright (c) 2000-2014 The Apache Software " \
+#define APU_COPYRIGHT "Copyright (c) 2000-2015 The Apache Software " \
"Foundation or its licensors, as applicable."
/* The numeric compile-time version constants. These constants are the