Merge remote-tracking branch 'origin/develop' into tizen 44/20744/1
authoryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Mon, 12 May 2014 13:18:12 +0000 (22:18 +0900)
committeryonghwan82.jeon <yonghwan82.jeon@samsung.com>
Mon, 12 May 2014 13:18:12 +0000 (22:18 +0900)
commitc1f53d304273370ee6d94d8f5dd6c0124af2457c
tree3ef1f9ed99fb50f29982352f92d31b7d7e1526f6
parentd672b66c639db51203873c77b3a6f398adb349bb
Merge remote-tracking branch 'origin/develop' into tizen

* origin/develop:
  PROJTEMP : Update "modifyStyle" function.
  Merge remote-tracking branch 'origin/nscreen' into develop

Change-Id: I2cdcbb6cf0d84e165affac5552f46f0b20fdc13c
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/html/ground.js
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/html/ground.js
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/html/ground.js
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/html/ground.js
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/xslt/page_managed_css_ver0_0_3.xslt