Merge branch 'refs/heads/develop' into VF2JS
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0f18007e Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0f18007e Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0f18007e Branch: refs/heads/VF2JS Commit: 0f18007ee071f077936df5e3bc83b424c8d60ed0 Parents: 238ceca 32d97f6 Author: Erik de Bruin <e...@ixsoftware.nl> Authored: Wed Jul 9 15:59:19 2014 +0200 Committer: Erik de Bruin <e...@ixsoftware.nl> Committed: Wed Jul 9 15:59:19 2014 +0200 ---------------------------------------------------------------------- apache-flex-flexjs-installer-config.xml | 18 +++++--- build.xml | 15 +----- examples/ImageTest/build.xml | 43 ++++++++++++++++++ examples/ImageTest/src/ImageTest.mxml | 33 ++++++++++++++ examples/ImageTest/src/MyInitialView.mxml | 45 ++++++++++++++++++ examples/ImageTest/src/largegreenrect.png | Bin 0 -> 56681 bytes examples/ImageTest/src/smallbluerect.jpg | Bin 0 -> 13500 bytes examples/ImageTest/src/smallgreenrect.jpg | Bin 0 -> 13542 bytes examples/ImageTest/src/smallorangerect.gif | Bin 0 -> 821 bytes examples/build.xml | 3 ++ installer.xml | 58 ++++++++++++++++++++++-- 11 files changed, 193 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
