flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject [34/34] git commit: [flex-utilities] [refs/heads/develop] - Merge branch 'apache-tour-de-flex-1.2' into develop
Date Fri, 06 Feb 2015 00:01:17 GMT
Merge branch 'apache-tour-de-flex-1.2' into develop


Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/a557d55c
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/a557d55c
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/a557d55c

Branch: refs/heads/develop
Commit: a557d55cc817ef3a5b18ff26e203eea4b6a8fa09
Parents: 8756b8f 8cf18f3
Author: Justin Mclean <jmclean@apache.org>
Authored: Fri Feb 6 11:00:35 2015 +1100
Committer: Justin Mclean <jmclean@apache.org>
Committed: Fri Feb 6 11:00:35 2015 +1100

----------------------------------------------------------------------
 TourDeFlex/CONTRIBUTORS                         |   5 +
 TourDeFlex/LICENSE                              |   3 +
 TourDeFlex/NOTICE                               |   2 +-
 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 +
 18 files changed, 286 insertions(+), 335 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/a557d55c/TourDeFlex/NOTICE
----------------------------------------------------------------------
diff --cc TourDeFlex/NOTICE
index 1f584fd,f258929..2efeda5
--- a/TourDeFlex/NOTICE
+++ b/TourDeFlex/NOTICE
@@@ -14,4 -14,4 +14,4 @@@ http://www.freesound.org/people/cameron
  
  The text used in the summaries of each version of Apache Flex
  in TourDeFlex can be found here:
- http://http://en.wikipedia.org/wiki/Apache_Flex
 -http://en.wikipedia.org/wiki/Apache_Flex
++http://en.wikipedia.org/wiki/Apache_Flex


Mime
View raw message