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 2013/04/09 15:11:50 UTC

svn commit: r1466017 - in /syncope/trunk: ./ .travis.yml

Author: ilgrosso
Date: Tue Apr  9 13:11:49 2013
New Revision: 1466017

URL: http://svn.apache.org/r1466017
Log:
Merge from 1_1_X

Added:
    syncope/trunk/.travis.yml
      - copied unchanged from r1466016, syncope/branches/1_1_X/.travis.yml
Modified:
    syncope/trunk/   (props changed)

Propchange: syncope/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Apr  9 13:11:49 2013
@@ -6,3 +6,4 @@ target
 .settings
 .project
 .profile.swp
+.travis.yml.swp

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_0_X:r1465966-1466015
  Merged /syncope/branches/1_1_X:r1466004-1466016