Merge remote-tracking branch 'origin/tizen' into develop 04/20004/1
authorHeekyoung, Oh <heekyoung.oh@samsung.com>
Thu, 24 Apr 2014 10:52:10 +0000 (19:52 +0900)
committerHeekyoung, Oh <heekyoung.oh@samsung.com>
Thu, 24 Apr 2014 10:52:10 +0000 (19:52 +0900)
commitfeafc05874c4264c052033ad89b3f2973b902305
treef4607c103d82d963b477cd68fd47cd4593d66dd4
parent6884f6860760ac49257a3a0a9fc04aed43816b35
Merge remote-tracking branch 'origin/tizen' into develop

* origin/tizen:
  DESIGNER : Designer going bridge bug fix java compile version error fix (java 1.7 -> java 1.6)
  Merge remote-tracking branch 'origin/develop' into tizen

Change-Id: I62ba2fb58887f80731fd85c279c8fdf65fd7750a
Signed-off-by: Heekyoung, Oh <heekyoung.oh@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/ui/views/databinding/DataBindingPage.java
org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/databinding/dialog/Helper.java
package/changelog
package/pkginfo.manifest