tree 04865a2a08ccd88cb17b57e3fba7334f2bb0c7b5
parent 0bfbaed0d28b14c7fffd4de0c92e11b1cb1f18fd
parent 695151d4db413f4a076e5421bfbd6fb2c005265b
author Erik de Bruin <erik@ixsoftware.nl> 1427708058 +0200
committer Erik de Bruin <erik@ixsoftware.nl> 1427708058 +0200

Merge branch 'release4.14.1'

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>

Conflicts:
	apache-flex-sdk-installer-config.xml
	build.properties
	flex-sdk-description.xml
	frameworks/build.xml
	frameworks/projects/advancedgrids/src/mx/core/Version.as
	frameworks/projects/airframework/src/mx/core/Version.as
	frameworks/projects/airspark/src/spark/core/Version.as
	frameworks/projects/apache/src/core/Version.as
	frameworks/projects/automation/src/mx/core/Version.as
	frameworks/projects/automation_agent/src/mx/core/Version.as
	frameworks/projects/automation_air/src/mx/core/Version.as
	frameworks/projects/automation_dmv/src/mx/core/Version.as
	frameworks/projects/automation_flashflexkit/src/mx/core/Version.as
	frameworks/projects/automation_spark/src/mx/core/Version.as
	frameworks/projects/automation_spark/src/spark/core/Version.as
	frameworks/projects/charts/src/mx/core/Version.as
	frameworks/projects/framework/src/mx/core/FlexVersion.as
	frameworks/projects/framework/src/mx/core/Version.as
	frameworks/projects/mx/src/mx/core/Version.as
	frameworks/projects/rpc/src/mx/core/Version.as
	frameworks/projects/spark/src/spark/core/Version.as
	frameworks/projects/spark/src/spark/skins/spark/BusyIndicatorSkin.as
	frameworks/projects/spark_dmv/src/spark/core/Version.as
	frameworks/projects/tool/src/mx/core/Version.as
	frameworks/projects/tool_air/src/mx/core/Version.as
	ide/addAIRtoSDK.sh
	ide/checkAllPlayerGlobals.sh
	ide/flashbuilder/config/air-config.xml
	ide/flashbuilder/config/flex-config.xml
	ide/setFlashPlayerVersion.sh
	jenkins.xml
	modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
	modules/compiler/src/java/flex2/tools/VersionInfo.java