From: yonghwan82.jeon <yonghwan82.jeon@samsung.com>
Date: Mon, 12 May 2014 16:28:58 +0000 (+0900)
Subject: Merge remote-tracking branch 'origin/tizen' into mw
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60c732b94ca4ec9f7c1b7ce8b0fe145d04e5ae6e;p=sdk%2Fide%2Fweb-ui-builder-eplugin.git

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

* origin/tizen: (34 commits)
  NSCREEN :merge nscreen
  Merge remote-tracking branch 'origin/nscreen' into develop
  Merge remote-tracking branch 'origin/develop' into nscreen
  NSCREEN : cssfile loader added cssfile loading added
  PROP : Fix color picker method. And fix "modifyStyle" API.
  UIB : fix west & noth direction resize
  NSCREEN : remove unused code. remove unused code.
  NSCREEN : Old nscreen source delete NScreenList, NScreenListItem class delete
  NSCREEN : NScreen view implement update NScreen view contents changed NScreen view action changed Nscreen icons added
  ANIMATOR : Refresh TimelinePage This is refreshing timeline when change page.
  UIB : rename Part.getPosition to Part.getPositionProperty
  UIB : add resize command
  ANIMATOR : Add messages using the timeline This is message using the timeline.
  NSCREEN : Modify meta reader&writer. Modify meta reader and writer for Nscreen view menu info.
  ANIMATOR : Implements cut, copy, paste Implements Animation cut, copy, paste
  NSCREEN: Make nscreenModelManager. Make nscreenModelManger.
  ANIMATOR : Fixed animator initialization This is fixing animator initialization.
  ANIMATOR : Check AnimationGroup Name This is checking animationgroup name duplication.
  NSCREEN : add getNscreeNModelList(device info) get NscreenModellist.
  NSCREEN : Update device Info and modify NscreenModel Update real device and Modify Nscreenmodel.
  ...

Conflicts:
	package/changelog

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

60c732b94ca4ec9f7c1b7ce8b0fe145d04e5ae6e