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)
commitf8132888b437b891fb3b232f075d1d750a8f63ad
tree039a45df5bfdd7089f952499a3edf8ca1df89839
parent9fcff6ecf04eedb19144bf79e210240f03bb830f
parent14687489fb4608d434ec0e39580dd3f92629435d
Merge remote-tracking branch 'origin/tizen' into mw

* 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>