Merge remote-tracking branch 'origin/tizen' into mw 12/21012/1
authoryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Wed, 14 May 2014 11:52:21 +0000 (20:52 +0900)
committeryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Wed, 14 May 2014 11:52:21 +0000 (20:52 +0900)
commitb2178f6025094b2a124f3b34d5234ff36c36710d
tree12914fa35acc2141a232a06b542fe652e8460f16
parent37518b59a937552c8aa62999638c733d94508b37
Merge remote-tracking branch 'origin/tizen' into mw

* origin/tizen:
  Merge remote-tracking branch 'origin/develop' into tizen

Change-Id: Ib54a1285967d8743389308d5d74740643871aea6
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
14 files changed:
package/changelog
package/pkginfo.manifest
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/html/ground.js
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/html/ground.js
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/html/ground.js
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/html/ground.js