projects / profile / mobile / sdk / web-ui-builder-template.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9fcff6e 1468748)
Merge remote-tracking branch 'origin/tizen' into mw 51/20751/1
authoryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Mon, 12 May 2014 13:26:45 +0000 (22:26 +0900)
committeryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Mon, 12 May 2014 13:26:45 +0000 (22:26 +0900)
* origin/tizen:
  PROJECTEMP : update version update version.
  Merge remote-tracking branch 'origin/develop' into tizen

Conflicts:
package/changelog

Change-Id: Id4aed1f497df31f676e809ccc08a2f7539236957
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>

Trivial merge
Domain: SDK / Web IDE;