harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r530957 - /harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml
Date Sat, 21 Apr 2007 00:33:24 GMT
Author: ndbeyer
Date: Fri Apr 20 17:33:24 2007
New Revision: 530957

URL: http://svn.apache.org/viewvc?view=rev&rev=530957
Log:
Fix unfinished merge -- sorry.

Modified:
    harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml?view=diff&rev=530957&r1=530956&r2=530957
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml Fri Apr 20 17:33:24 2007
@@ -144,37 +144,20 @@
                         <select os="lnx">
                             <syslibset type="shared" libs="stdc++, gcc_s, pthread, rt"
/>
                             <select arch="ia32">
-<<<<<<< .mine
-                    <libset type="shared" libs="icuuc"
-=======
-                                <libset type="shared" libs="icuuc"
->>>>>>> .r530955
-                                    dir="${external.dep.CLASSLIB}/depends/libs/linux.x86"
/>
-<<<<<<< .mine
-                    <libset type="shared" libs="icudata"
-=======
+                                <libset type="shared" libs="icuuc" />
                                 <libset type="shared" libs="icudata"
->>>>>>> .r530955
                                     dir="${external.dep.CLASSLIB}/depends/libs/linux.x86"
/>
                                 </select>               
                             <select arch="em64t">
                                 <libset type="shared" libs="icuuc"
                                     dir="${external.dep.CLASSLIB}/depends/libs/linux.x86_64"
/>
-<<<<<<< .mine
-                    <libset type="shared" libs="icudata"
-=======
                                 <libset type="shared" libs="icudata"
->>>>>>> .r530955
                                     dir="${external.dep.CLASSLIB}/depends/libs/linux.x86_64"
/>
                             </select>
                             <select arch="ipf">
                                 <libset type="shared" libs="icuuc"
                                     dir="${external.dep.CLASSLIB}/depends/libs/linux.ia64"
/>
-<<<<<<< .mine
-                    <libset type="shared" libs="icudata"
-=======
                                 <libset type="shared" libs="icudata"
->>>>>>> .r530955
                                     dir="${external.dep.CLASSLIB}/depends/libs/linux.ia64"
/>
                             </select>
                         </select>



Mime
View raw message