Merge remote-tracking branch 'origin/mw' into tizen 97/22397/1
authoryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Tue, 3 Jun 2014 04:03:12 +0000 (13:03 +0900)
committeryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Tue, 3 Jun 2014 04:03:12 +0000 (13:03 +0900)
commitd930ae61f457c0b67afbcec0d0adf2fd20b66a5d
tree5db06976b820922782f6bdabe8f28e6b3e8e1ea9
parent1a56ae2de4baa179ef94ba7339e46b5001ab1bcf
parent8d5cbb75fdd09750d104eb05f86b4e5f1f98cb66
Merge remote-tracking branch 'origin/mw' into tizen

Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/animator/model/AnimatorFrame.java

Change-Id: I8f82f1619315f1a0bf6af0cfa245e74ee9957db2
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
org.tizen.webuibuilder/src/org/tizen/webuibuilder/gef/viewer/HoverBrowserViewer.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java