stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject svn commit: r656706 - in /stdcxx/branches/4.2.x/bin: genxviews xbuildgen
Date Thu, 15 May 2008 15:42:04 GMT
Author: sebor
Date: Thu May 15 08:42:04 2008
New Revision: 656706

URL: http://svn.apache.org/viewvc?rev=656706&view=rev
Log:
2008-05-15  Martin Sebor  <sebor@roguewave.com>

	* bin/genxviews: Removed merge artifacts inadvertently introduced
	in rev 656702.
	* bin/xbuildgen: Same.

Modified:
    stdcxx/branches/4.2.x/bin/genxviews
    stdcxx/branches/4.2.x/bin/xbuildgen

Modified: stdcxx/branches/4.2.x/bin/genxviews
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/bin/genxviews?rev=656706&r1=656705&r2=656706&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/bin/genxviews (original)
+++ stdcxx/branches/4.2.x/bin/genxviews Thu May 15 08:42:04 2008
@@ -1,10 +1,6 @@
 #!/bin/sh
 #
-<<<<<<< .working
 # $Id: genxviews 589896 2007-10-29 22:44:55Z sebor $
-=======
-# $Id: genxviews 601595 2007-12-06 01:33:50Z sebor $
->>>>>>> .merge-right.r656504
 #
 ########################################################################
 #

Modified: stdcxx/branches/4.2.x/bin/xbuildgen
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/bin/xbuildgen?rev=656706&r1=656705&r2=656706&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/bin/xbuildgen (original)
+++ stdcxx/branches/4.2.x/bin/xbuildgen Thu May 15 08:42:04 2008
@@ -1,10 +1,6 @@
 #!/bin/sh
 #
-<<<<<<< .working
 # $Id: xbuildgen 589895 2007-10-29 22:37:40Z sebor $
-=======
-# $Id: xbuildgen 601917 2007-12-06 23:46:48Z sebor $
->>>>>>> .merge-right.r656504
 #
 ########################################################################
 #



Mime
View raw message