Author: ay Date: Thu Jan 26 13:55:47 2012 New Revision: 1236176 URL: http://svn.apache.org/viewvc?rev=1236176&view=rev Log: Merged revisions 1236170 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1236170 | ay | 2012-01-26 14:26:01 +0100 (Thu, 26 Jan 2012) | 16 lines 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.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/.gitignore Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jan 26 13:55:47 2012 @@ -1,3 +1,3 @@ -/cxf/branches/2.4.x-fixes:1235732 -/cxf/branches/2.5.x-fixes:1235731 -/cxf/trunk:1235730 +/cxf/branches/2.4.x-fixes:1235732,1236170 +/cxf/branches/2.5.x-fixes:1235731,1236169 +/cxf/trunk:1235730,1236166 Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/.gitignore URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/.gitignore?rev=1236176&r1=1236175&r2=1236176&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/.gitignore (original) +++ cxf/branches/2.3.x-fixes/.gitignore Thu Jan 26 13:55:47 2012 @@ -1,4 +1,6 @@ -*.i?? +*.iml +*.ipr +*.iws .DS_Store .checkstyle .classpath
