Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk 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/89853fa1 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/89853fa1 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/89853fa1 Branch: refs/heads/develop Commit: 89853fa181c6bd5f3b781cda88a4c9b967000619 Parents: 053f861 5575165 Author: Nick Kwiatkowski <[email protected]> Authored: Tue May 20 22:27:12 2014 -0400 Committer: Nick Kwiatkowski <[email protected]> Committed: Tue May 20 22:27:12 2014 -0400 ---------------------------------------------------------------------- .../projects/experimental/src/spark/components/ColorPicker.as | 2 ++ .../experimental/src/spark/skins/ColorPickerButtonSkin.mxml | 2 +- frameworks/projects/spark/src/spark/components/ComboBox.as | 3 ++- .../src/spark/components/supportClasses/DropDownController.as | 3 +++ 4 files changed, 8 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
