projects / platform / core / csapi / tizenfx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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


Trivial merge
Domain: Dotnet / Frameworks;