projects / platform / core / csapi / nui.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fd61d17 aa78a89)
Merge branch 'devel/master' into tizen 27/131827/1
authordongsug.song <dongsug.song@samsung.com>
Wed, 31 May 2017 01:58:34 +0000 (10:58 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Wed, 31 May 2017 01:58:34 +0000 (10:58 +0900)
commit513950d862271acf801aa4e10446ae30d0b8b445
tree44ecf093d49582ab414815caf929017f4963a097tree | snapshot
parentfd61d1743d669a98c76d523c67760084a9e22a90commit | diff
parentaa78a8955a4d49cf1dab3d9897ce2e1151995738commit | diff
Merge branch 'devel/master' into tizen

Conflicts:
.gitignore
NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/App.cs
NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/Constants.cs
NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusData.cs
NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusEffect.cs
NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/IFocusEffect.cs
NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs

Change-Id: I801e67f26e24001246365a08c85be2e8b9dbd629
Domain: Graphics System / DALi; Licenses: Apache-2.0;