Author: ilgrosso
Date: Mon May 5 07:49:32 2014
New Revision: 1592460
URL: http://svn.apache.org/r1592460
Log:
Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/pom.xml
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1587545-1592459
Modified: syncope/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1592460&r1=1592459&r2=1592460&view=diff
==============================================================================
--- syncope/trunk/pom.xml (original)
+++ syncope/trunk/pom.xml Mon May 5 07:49:32 2014
@@ -32,8 +32,8 @@ under the License.
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>13</version>
- <relativePath />
+ <version>14</version>
+ <relativePath/>
</parent>
<url>http://syncope.apache.org/</url>
