Merge 4.14.1 release into develop
Conflicts:
CONTRIBUTORS
RELEASE_NOTES
frameworks/build.xml
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/7445d3e7
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/7445d3e7
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/7445d3e7
Branch: refs/heads/develop
Commit: 7445d3e735fefb187d2116b310b956dc0440df21
Parents: 528c7c5 695151d
Author: Justin Mclean <jmcl...@apache.org>
Authored: Wed Nov 18 15:18:06 2015 +1100
Committer: Justin Mclean <jmcl...@apache.org>
Committed: Wed Nov 18 15:18:06 2015 +1100
----------------------------------------------------------------------
README | 2 +-
.../src/java/flex2/compiler/common/MxmlConfiguration.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7445d3e7/README
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/7445d3e7/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
----------------------------------------------------------------------
diff --cc modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
index 2433614,a95e777..7976103
--- a/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
+++ b/modules/compiler/src/java/flex2/compiler/common/MxmlConfiguration.java
@@@ -46,7 -46,7 +46,8 @@@ public class MxmlConfiguratio
//
// 'compiler.mxml.compatibility-version' option
//
+ public static final int VERSION_4_15 = 0x040f0000;
+ public static final int VERSION_4_14_1 = 0x040e0001;
public static final int VERSION_4_14 = 0x040e0000;
public static final int VERSION_4_13 = 0x040d0000;
public static final int VERSION_4_12_1 = 0x040c0001;
