projects / platform / core / csapi / tizenfx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 976f683 c38d76a)
Merge branch 'devel/master' into tizen
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)
commit6293b652c0508d942b3960be416162bae40e4ae2
tree1c825cccb1763ba36b5cc889a85c642d5deef367tree | snapshot
parent976f683fd2e80fbcaac6c0be9a4bac3bfb71486fcommit | diff
parentc38d76a9dbd80a8257f5075f1c281454edebbd41commit | 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: Dotnet / Frameworks;