Merge remote-tracking branch 'origin/develop' into tizen 72/18572/1
authoryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Wed, 26 Mar 2014 08:54:01 +0000 (17:54 +0900)
committeryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Wed, 26 Mar 2014 08:54:01 +0000 (17:54 +0900)
commitf7fbd8c5dccb1ca1046aa62233477143151125b1
tree0044e32be30f9788e3b39e090f1d6ea7a8ee4977
parentf98cd6d732623b72abab2f19f954d479f7fdebda
parentabbe83d31afd4bd1993049e54b5ce652783325f9
Merge remote-tracking branch 'origin/develop' into tizen

* origin/develop:
  PROP : Refactoring CssSelectorCategory.
  DATABIND : Change the remove UX remove the X button add the del key input
  SNIPPET : Refactoring id policy
  PROP : Fix dispose exception on CssStyleTab.
  NSCREEN : Remove possible Error. Add defense code for possible error by static analyzer
  PROP : Fix exception on CssSelectorCategory.
  UIB : code refactoring for PREVENT

Conflicts:
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/SetSourceDialog.java

Change-Id: I907aafa2018d0c11de30916a26b6bd9707d32663
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/DataBindingPage.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/SetSourceDialog.java