You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2012/01/26 14:26:02 UTC
svn commit: r1236170 - in /cxf/branches/2.4.x-fixes: ./ .gitignore
Author: ay
Date: Thu Jan 26 13:26:01 2012
New Revision: 1236170
URL: http://svn.apache.org/viewvc?rev=1236170&view=rev
Log:
Merged revisions 1236169 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
................
r1236169 | ay | 2012-01-26 14:17:33 +0100 (Thu, 26 Jan 2012) | 9 lines
Merged revisions 1236166 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1236166 | ay | 2012-01-26 14:04:03 +0100 (Thu, 26 Jan 2012) | 1 line
fixed .gitignore so .idl files are not ignored
........
................
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/.gitignore
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 26 13:26:01 2012
@@ -1,2 +1,2 @@
-/cxf/branches/2.5.x-fixes:1235547,1235731,1235848
-/cxf/trunk:1235544,1235730,1235844
+/cxf/branches/2.5.x-fixes:1235547,1235731,1235848,1236169
+/cxf/trunk:1235544,1235730,1235844,1236166
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/.gitignore
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/.gitignore?rev=1236170&r1=1236169&r2=1236170&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/.gitignore (original)
+++ cxf/branches/2.4.x-fixes/.gitignore Thu Jan 26 13:26:01 2012
@@ -1,4 +1,6 @@
-*.i??
+*.iml
+*.ipr
+*.iws
.DS_Store
.checkstyle
.classpath