fix merge issue
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/dea298c0 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/dea298c0 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/dea298c0 Branch: refs/heads/develop Commit: dea298c0d4e77b295965f82e0dd37cdb366f1e72 Parents: 1b877a7 Author: Justin Mclean <[email protected]> Authored: Mon Sep 2 09:39:30 2013 +1000 Committer: Justin Mclean <[email protected]> Committed: Mon Sep 2 09:39:30 2013 +1000 ---------------------------------------------------------------------- flex-sdk-description.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/dea298c0/flex-sdk-description.xml ---------------------------------------------------------------------- diff --git a/flex-sdk-description.xml b/flex-sdk-description.xml index c6b937a..217ef12 100644 --- a/flex-sdk-description.xml +++ b/flex-sdk-description.xml @@ -20,6 +20,6 @@ <flex-sdk-description> <name>Apache Flex 4.10.0 FP11.1 AIR3.7 en_US</name> <version>4.10.0</version> -<build>20130819</build> +<build>20130801</build> </flex-sdk-description> \ No newline at end of file
