You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/08/24 16:34:40 UTC

svn commit: r1161127 - in /cxf/branches/2.3.x-fixes: ./ .gitignore

Author: dkulp
Date: Wed Aug 24 14:34:40 2011
New Revision: 1161127

URL: http://svn.apache.org/viewvc?rev=1161127&view=rev
Log:
Merged revisions 1161123 via svnmerge from 
https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes

................
  r1161123 | dkulp | 2011-08-24 10:30:57 -0400 (Wed, 24 Aug 2011) | 9 lines
  
  Merged revisions 1161048 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r1161048 | ningjiang | 2011-08-24 07:06:37 -0400 (Wed, 24 Aug 2011) | 1 line
    
    Add git ignore entry for the IntellijIDEA project files
  ........
................

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    cxf/branches/2.3.x-fixes/.gitignore

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=1161127&r1=1161126&r2=1161127&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/.gitignore (original)
+++ cxf/branches/2.3.x-fixes/.gitignore Wed Aug 24 14:34:40 2011
@@ -1,3 +1,5 @@
+*.i??
+.DS_Store
 .checkstyle
 .classpath
 .pmd