flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [2/5] git commit: [flex-sdk] - fix merge errors
Date Wed, 17 Apr 2013 17:15:22 GMT
fix merge errors


Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/785d89c4
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/785d89c4
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/785d89c4

Branch: refs/heads/develop
Commit: 785d89c4be0e12dce5f15157a6daf3a3c2d43cc9
Parents: dba9f08
Author: Alex Harui <aharui@apache.org>
Authored: Tue Apr 16 11:37:52 2013 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Wed Apr 17 10:13:53 2013 -0700

----------------------------------------------------------------------
 frameworks/build_framework.xml |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/785d89c4/frameworks/build_framework.xml
----------------------------------------------------------------------
diff --git a/frameworks/build_framework.xml b/frameworks/build_framework.xml
index 1cecfda..6189557 100644
--- a/frameworks/build_framework.xml
+++ b/frameworks/build_framework.xml
@@ -871,10 +871,10 @@
 			<jvmarg line="${compc.jvm.args}"/>
 			<keep-as3-metadata>IMXMLObject</keep-as3-metadata>
 			<include-namespaces uri="library://ns.adobe.com/flashx/textLayout"/>
-			<namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${textLayout.ver.dir}/manifest.xml"/>
-			<source-path path-element="${textLayout.ver.dir}/src"/>
+			<namespace uri="library://ns.adobe.com/flashx/textLayout" manifest="${textLayout.dir}/manifest.xml"/>
+			<source-path path-element="${textLayout.dir}/src"/>
 			<library-path/>
-			<include-file name="manifest.xml" path="${textLayout.ver.dir}/manifest.xml"/>
+			<include-file name="manifest.xml" path="${textLayout.dir}/manifest.xml"/>
 			<static-link-runtime-shared-libraries/>
 			<define name="CONFIG::debug" value="false"/>
 			<define name="CONFIG::release" value="true"/>
@@ -883,11 +883,7 @@
 
     <target name="textLayout_rb" description="Builds default locale textLayout_rb.swc">
         <compc static-link-runtime-shared-libraries="true" fork="true" locale="${locale}"

-<<<<<<< HEAD
             output="${basedir}/locale/${locale}/textLayout_rb.swc">
-=======
-            output="${basedir}/locale/${locale}/mx_rb.swc">
->>>>>>> origin/release4.9
             <include-resource-bundles bundle="textLayout"/>
             <source-path path-element="${textLayout.dir}/bundles/${locale}"/>
             <external-library-path dir="${playerglobal.dir}" includes="playerglobal.swc"/>


Mime
View raw message