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/cdaba123
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/cdaba123
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/cdaba123

Branch: refs/heads/develop
Commit: cdaba1234c1e2801cec8aabb0a29980afda6eb02
Parents: d3d4cca 25aabf1
Author: Justin Mclean <jmcl...@apache.org>
Authored: Tue Oct 22 08:49:37 2013 +1100
Committer: Justin Mclean <jmcl...@apache.org>
Committed: Tue Oct 22 08:49:37 2013 +1100

----------------------------------------------------------------------
 frameworks/projects/spark/defaults.css          |   4 +
 .../spark/src/spark/components/CalloutButton.as |  42 +-
 .../Properties/CallOutButton_Basic.mxml         | 564 ----------------
 .../baselines/calloutbutton_afterAfter.png      | Bin 38142 -> 0 bytes
 .../baselines/calloutbutton_afterAuto.png       | Bin 37292 -> 0 bytes
 .../baselines/calloutbutton_afterBefore.png     | Bin 38303 -> 0 bytes
 .../baselines/calloutbutton_afterEnd.png        | Bin 37563 -> 0 bytes
 .../baselines/calloutbutton_afterMiddle.png     | Bin 37746 -> 0 bytes
 .../baselines/calloutbutton_afterStart.png      | Bin 37087 -> 0 bytes
 .../baselines/calloutbutton_autoAfter.png       | Bin 37935 -> 0 bytes
 .../baselines/calloutbutton_autoAuto.png        | Bin 38849 -> 0 bytes
 .../baselines/calloutbutton_autoBefore.png      | Bin 39105 -> 0 bytes
 .../baselines/calloutbutton_autoEnd.png         | Bin 38015 -> 0 bytes
 .../baselines/calloutbutton_autoMiddle.png      | Bin 38110 -> 0 bytes
 .../baselines/calloutbutton_autoStart.png       | Bin 37248 -> 0 bytes
 .../baselines/calloutbutton_beforeAfter.png     | Bin 38693 -> 0 bytes
 .../baselines/calloutbutton_beforeAuto.png      | Bin 38632 -> 0 bytes
 .../baselines/calloutbutton_beforeBefore.png    | Bin 40032 -> 0 bytes
 .../baselines/calloutbutton_beforeEnd.png       | Bin 38917 -> 0 bytes
 .../baselines/calloutbutton_beforeMiddle.png    | Bin 38850 -> 0 bytes
 .../baselines/calloutbutton_beforeStart.png     | Bin 38058 -> 0 bytes
 .../baselines/calloutbutton_click.png           | Bin 37275 -> 0 bytes
 .../baselines/calloutbutton_endAfter.png        | Bin 38480 -> 0 bytes
 .../baselines/calloutbutton_endAuto.png         | Bin 39207 -> 0 bytes
 .../baselines/calloutbutton_endBefore.png       | Bin 39563 -> 0 bytes
 .../baselines/calloutbutton_endEnd.png          | Bin 38614 -> 0 bytes
 .../baselines/calloutbutton_endMiddle.png       | Bin 38325 -> 0 bytes
 .../baselines/calloutbutton_endStart.png        | Bin 38037 -> 0 bytes
 .../baselines/calloutbutton_middleAfter.png     | Bin 39173 -> 0 bytes
 .../baselines/calloutbutton_middleAuto.png      | Bin 39906 -> 0 bytes
 .../baselines/calloutbutton_middleBefore.png    | Bin 40471 -> 0 bytes
 .../baselines/calloutbutton_middleEnd.png       | Bin 41244 -> 0 bytes
 .../baselines/calloutbutton_middleMiddle.png    | Bin 39412 -> 0 bytes
 .../baselines/calloutbutton_middleStart.png     | Bin 39408 -> 0 bytes
 .../Properties/baselines/calloutbutton_over.png | Bin 36808 -> 0 bytes
 .../baselines/calloutbutton_startAfter.png      | Bin 39745 -> 0 bytes
 .../baselines/calloutbutton_startAuto.png       | Bin 40580 -> 0 bytes
 .../baselines/calloutbutton_startBefore.png     | Bin 40545 -> 0 bytes
 .../baselines/calloutbutton_startEnd.png        | Bin 39799 -> 0 bytes
 .../baselines/calloutbutton_startMiddle.png     | Bin 39379 -> 0 bytes
 .../baselines/calloutbutton_startStart.png      | Bin 38803 -> 0 bytes
 .../CallOutButton/SWFs/CallOutButton_Main.mxml  | 269 --------
 .../CallOutButton/SWFs/assets/help.png          | Bin 3081 -> 0 bytes
 .../Properties/CalloutButton_Basic.mxml         | 660 +++++++++++++++++++
 .../baselines/calloutbutton_afterAfter.png      | Bin 0 -> 38386 bytes
 .../baselines/calloutbutton_afterAuto.png       | Bin 0 -> 37065 bytes
 .../baselines/calloutbutton_afterBefore.png     | Bin 0 -> 37733 bytes
 .../baselines/calloutbutton_afterEnd.png        | Bin 0 -> 37013 bytes
 .../baselines/calloutbutton_afterMiddle.png     | Bin 0 -> 37245 bytes
 .../baselines/calloutbutton_afterStart.png      | Bin 0 -> 36916 bytes
 .../baselines/calloutbutton_autoAfter.png       | Bin 0 -> 37648 bytes
 .../baselines/calloutbutton_autoAuto.png        | Bin 0 -> 37380 bytes
 .../baselines/calloutbutton_autoBefore.png      | Bin 0 -> 37592 bytes
 .../baselines/calloutbutton_autoEnd.png         | Bin 0 -> 36888 bytes
 .../baselines/calloutbutton_autoMiddle.png      | Bin 0 -> 37327 bytes
 .../baselines/calloutbutton_autoStart.png       | Bin 0 -> 36726 bytes
 .../baselines/calloutbutton_beforeAfter.png     | Bin 0 -> 38242 bytes
 .../baselines/calloutbutton_beforeAuto.png      | Bin 0 -> 37428 bytes
 .../baselines/calloutbutton_beforeBefore.png    | Bin 0 -> 38638 bytes
 .../baselines/calloutbutton_beforeEnd.png       | Bin 0 -> 37477 bytes
 .../baselines/calloutbutton_beforeMiddle.png    | Bin 0 -> 38433 bytes
 .../baselines/calloutbutton_beforeStart.png     | Bin 0 -> 38264 bytes
 .../baselines/calloutbutton_click.png           | Bin 0 -> 37971 bytes
 .../baselines/calloutbutton_endAfter.png        | Bin 0 -> 38600 bytes
 .../baselines/calloutbutton_endAuto.png         | Bin 0 -> 38777 bytes
 .../baselines/calloutbutton_endBefore.png       | Bin 0 -> 37336 bytes
 .../baselines/calloutbutton_endEnd.png          | Bin 0 -> 37497 bytes
 .../baselines/calloutbutton_endMiddle.png       | Bin 0 -> 38239 bytes
 .../baselines/calloutbutton_endStart.png        | Bin 0 -> 38543 bytes
 .../baselines/calloutbutton_middleAfter.png     | Bin 0 -> 40154 bytes
 .../baselines/calloutbutton_middleAuto.png      | Bin 0 -> 40280 bytes
 .../baselines/calloutbutton_middleBefore.png    | Bin 0 -> 40226 bytes
 .../baselines/calloutbutton_middleEnd.png       | Bin 0 -> 40294 bytes
 .../baselines/calloutbutton_middleMiddle.png    | Bin 0 -> 39501 bytes
 .../baselines/calloutbutton_middleStart.png     | Bin 0 -> 41539 bytes
 .../Properties/baselines/calloutbutton_over.png | Bin 0 -> 37130 bytes
 .../baselines/calloutbutton_startAfter.png      | Bin 0 -> 41939 bytes
 .../baselines/calloutbutton_startAuto.png       | Bin 0 -> 41513 bytes
 .../baselines/calloutbutton_startBefore.png     | Bin 0 -> 41344 bytes
 .../baselines/calloutbutton_startEnd.png        | Bin 0 -> 40073 bytes
 .../baselines/calloutbutton_startMiddle.png     | Bin 0 -> 39944 bytes
 .../baselines/calloutbutton_startStart.png      | Bin 0 -> 39893 bytes
 .../CalloutButton/SWFs/CallOutButton_Main.mxml  | 278 ++++++++
 .../CalloutButton/SWFs/assets/help.png          | Bin 0 -> 3081 bytes
 84 files changed, 979 insertions(+), 838 deletions(-)
----------------------------------------------------------------------


Reply via email to