You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/01/07 17:08:41 UTC
svn commit: r1556258 - in /syncope/trunk: ./ NOTICE legal_ext/NOTICE
Author: ilgrosso
Date: Tue Jan 7 16:08:41 2014
New Revision: 1556258
URL: http://svn.apache.org/r1556258
Log:
Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/NOTICE
syncope/trunk/legal_ext/NOTICE
Propchange: syncope/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Jan 7 16:08:41 2014
@@ -2,3 +2,4 @@ target
.subversion
.settings
.project
+.svn-prop.tmp.swp
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1555135-1556257
Modified: syncope/trunk/NOTICE
URL: http://svn.apache.org/viewvc/syncope/trunk/NOTICE?rev=1556258&r1=1556257&r2=1556258&view=diff
==============================================================================
--- syncope/trunk/NOTICE (original)
+++ syncope/trunk/NOTICE Tue Jan 7 16:08:41 2014
@@ -1,5 +1,5 @@
Apache Syncope
-Copyright 2012-2013 The Apache Software Foundation
+Copyright 2012-2014 The Apache Software Foundation
This product includes software developed by:
The Apache Software Foundation (http://www.apache.org/).
Modified: syncope/trunk/legal_ext/NOTICE
URL: http://svn.apache.org/viewvc/syncope/trunk/legal_ext/NOTICE?rev=1556258&r1=1556257&r2=1556258&view=diff
==============================================================================
--- syncope/trunk/legal_ext/NOTICE (original)
+++ syncope/trunk/legal_ext/NOTICE Tue Jan 7 16:08:41 2014
@@ -1,5 +1,5 @@
Apache Syncope
-Copyright 2012-2013 The Apache Software Foundation
+Copyright 2012-2014 The Apache Software Foundation
This product includes software developed by:
The Apache Software Foundation (http://www.apache.org/).