Merge remote-tracking branch 'origin/develop' into tizen 47/21147/1
authoryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Thu, 15 May 2014 10:34:38 +0000 (19:34 +0900)
committeryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Thu, 15 May 2014 10:34:38 +0000 (19:34 +0900)
commit27854411dc77aad2ae0b87a907277a4a9840ab3e
tree306be08b169b892d84ed8df4678e060744fad915
parent5411eed41ef7a1485445fccf89949786e423e721
Merge remote-tracking branch 'origin/develop' into tizen

* origin/develop:
  NSCREEN : default device changed profile default device added common feature history added
  PROP : Fix display size text when value modified.
  PROP : Add modify function in Transform. And add increment to SizeMethod.

Change-Id: Icc95346952bc078e325edf38f72117d80aea3ba8
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerToolbar.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenItem.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenPage.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/GroupValueMethod.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/MethodUtil.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/SizeMethod.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/properties/method/SizeRealMethod.java