8000 Master by donlcolvin · Pull Request #44 · apache/flex-sdk · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master #44

Closed
wants to merge 182 commits into from
Closed

Master #44

wants to merge 182 commits into from

Conversation

donlcolvin
Copy link

No description provided.

bigosmallm and others added 30 commits September 9, 2012 05:08
Fix made as per the task description to line 799.

git-svn-id: https://svn.apache.org/repos/asf/incubator/flex/sdk/trunk@1405000 13f79535-47bb-0310-9956-ffa450edef68
Fix made as per the task description to line 228.

git-svn-id: https://svn.apache.org/repos/asf/incubator/flex/sdk/trunk@1405001 13f79535-47bb-0310-9956-ffa450edef68
git-svn-id: https://svn.apache.org/repos/asf/flex/sdk/trunk@1429184 13f79535-47bb-0310-9956-ffa450edef68
This reverts commit 1a4946a, reversing
changes made to 97bedf7.
aharui and others added 26 commits January 14, 2015 12:54
Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>
Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>
Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>
Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>
Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>
Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>
'ant_on_air' does not grok the 'format' tag. Turns out we don't need it, as 'ant_on_air' DOES understand the DSTAMP variable that is set by the 'tstamp' tag.

Signed-off-by: Erik de Bruin <erik@ixsoftware.nl>
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
@hubot hubot deleted the master branch April 28, 2017 16:42
@hubot hubot restored the master branch April 28, 2017 21:36
@joshtynjala joshtynjala closed this Jul 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

0