review.tizen.org Git - profile/mobile/sdk/web-ui-builder-template.git/commit

projects / profile / mobile / sdk / web-ui-builder-template.git / commit

author	yonghwan82.jeon <yonghwan82.jeon@samsung.com>
	Wed, 14 May 2014 11:49:51 +0000 (20:49 +0900)
committer	yonghwan82.jeon <yonghwan82.jeon@samsung.com>
	Wed, 14 May 2014 11:49:51 +0000 (20:49 +0900)
commit	352507ccab551cdbf9762584090acedfea6430d5
tree	fcfb4b706a81f3abda674bef0792c4a9523a4d77	tree \| snapshot
parent	14687489fb4608d434ec0e39580dd3f92629435d	commit \| diff

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

* origin/develop:
  PROJTEMP : Update image descriptor.
  PROJTEMP : Update image widget descriptor.
  PROJTEMP : Add display style.
  PROJTEMP : Modify javascript for widget position.
  Merge remote-tracking branch 'origin/tizen' into develop
  PROJTEMP : Update "modifyStyle" function.
  Merge remote-tracking branch 'origin/nscreen' into develop

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

12 files changed:

templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml		diff \| blob \| history
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml		diff \| blob \| history
templates/Template/Tizen Web UI Builder/1.EmptyProject/project/tizen-ui-builder-tool/res/html/ground.js		diff \| blob \| history
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml		diff \| blob \| history
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml		diff \| blob \| history
templates/Template/Tizen Web UI Builder/2.SinglePageProject/project/tizen-ui-builder-tool/res/html/ground.js		diff \| blob \| history
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml		diff \| blob \| history
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml		diff \| blob \| history
templates/Template/Tizen Web UI Builder/3.MultiPageProject/project/tizen-ui-builder-tool/res/html/ground.js		diff \| blob \| history
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/CSSProperties.xml		diff \| blob \| history
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/descriptors/Tizen-web-ui-fw/tizen.types.xml		diff \| blob \| history
templates/Template/Tizen Web UI Builder/4.NavigationProject/project/tizen-ui-builder-tool/res/html/ground.js		diff \| blob \| history

Domain: SDK / Web IDE;

RSS Atom