Merge remote-tracking branch 'origin/develop' into nscreen 68/20768/1
authoryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Mon, 12 May 2014 15:36:18 +0000 (00:36 +0900)
committeryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Mon, 12 May 2014 15:36:18 +0000 (00:36 +0900)
commit842cf84e4755e4c128b77744ffea7045ae0c250f
treef048a10910d7a261f43df5037668560e98d84410
parent0816f58f277d03798467ac1ff457cc5cb63be08d
Merge remote-tracking branch 'origin/develop' into nscreen

* origin/develop:
  PROP : Fix color picker method. And fix "modifyStyle" API.
  UIB : fix west & noth direction resize

Change-Id: I289fe0958f53c762ee82b756712604f984c00671
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
org.tizen.webuibuilder/res/html/ground.js
org.tizen.webuibuilder/src/org/tizen/webuibuilder/bridge/DesignerGoingBridge.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/commands/DesignerResizeAndMoveLayoutCommand.java [new file with mode: 0644]
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/policies/DesignerAbsoluteDragEditPolicy.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManagerForHTML.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/ColorPickerFillMethod.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/ColorPickerMethod.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/CustomCSSMethod.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/Method.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/SizeMethod.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/style/CssStyleTab.java