Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/158528f9 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/158528f9 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/158528f9 Branch: refs/heads/master Commit: 158528f9b5a5bcb3df7726b014526c531a43069e Parents: 9a29feb 6b0e182 Author: Fr�d�ric THMOAS <[email protected]> Authored: Mon Jun 9 12:53:13 2014 +0100 Committer: Fr�d�ric THMOAS <[email protected]> Committed: Mon Jun 9 12:53:13 2014 +0100 ---------------------------------------------------------------------- .../src/mx/collections/XMLListAdapter.as | 41 +-- .../src/mx/resources/ResourceManagerImpl.as | 12 +- installer.properties/en_US.properties | 1 + installer.xml | 307 ++++++++++++++++--- 4 files changed, 289 insertions(+), 72 deletions(-) ----------------------------------------------------------------------
