projects / platform / core / csapi / tizenfx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9e09330 6f75cc0)
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)
commit8c05bc9a68d8979328b5af67372901cb58389e49
tree898255278cf2e0e31f5b01602778dc5295e66380tree | snapshot
parent9e09330fa6bf7ac8d7154392738bc868fbea72bdcommit | diff
parent6f75cc07becbf27b1e098543d7af1e568a09ffdccommit | 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;