You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2016/03/30 07:14:08 UTC
[38/38] git commit: [flex-utilities] [refs/heads/master] - Merge
branch 'apache-tour-de-flex-1.2'
Merge branch 'apache-tour-de-flex-1.2'
Conflicts:
installer/src/InstallApacheFlex.mxml
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/48905dd2
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/48905dd2
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/48905dd2
Branch: refs/heads/master
Commit: 48905dd2f5020537da09877f03d00976e0c3d41d
Parents: 4f128cc 8cf18f3
Author: Justin Mclean <jm...@apache.org>
Authored: Wed Mar 30 16:13:15 2016 +1100
Committer: Justin Mclean <jm...@apache.org>
Committed: Wed Mar 30 16:13:15 2016 +1100
----------------------------------------------------------------------
TourDeFlex/CONTRIBUTORS | 5 +
TourDeFlex/LICENSE | 3 +
TourDeFlex/NOTICE | 6 +-
TourDeFlex/TourDeFlex3/RELEASE_NOTES | 2 +-
TourDeFlex/TourDeFlex3/build.xml | 121 +-
TourDeFlex/TourDeFlex3/src/3rdparty.xml | 9 +-
TourDeFlex/TourDeFlex3/src/AC_OETags.js | 282 -
TourDeFlex/TourDeFlex3/src/SpellingConfig.xml | 23 +
TourDeFlex/TourDeFlex3/src/ThirdPartyTab.mxml | 31 +
.../TourDeFlex3/src/apache/Squiggly1_1.mxml | 50 +
.../apache/controls/MaskedTextInputExample.mxml | 2 +-
.../src/apache/squiggly/SpellingConfig.xml | 6 +-
.../src/apache/squiggly/SpellingExExample.mxml | 19 +-
.../src/apache/squiggly/SpellingExample.mxml | 11 +-
TourDeFlex/TourDeFlex3/src/explorer.mxml | 22 +-
TourDeFlex/TourDeFlex3/src/explorer.xml | 2 +-
TourDeFlex/TourDeFlex3/src/loaderPanel.mxml | 24 +-
TourDeFlex/TourDeFlex3/src/viewsource.mxml | 7 +
installer/src/InstallApacheFlex.mxml | 6476 +++++++++---------
.../resource/ViewResourceConstants.as | 2 +-
20 files changed, 3423 insertions(+), 3680 deletions(-)
----------------------------------------------------------------------