Merge branch 'devel/master' into tizen

author dongsug.song <dongsug.song@samsung.com>

Wed, 5 Jul 2017 04:55:09 +0000 (13:55 +0900)

committer dongsug.song <dongsug.song@samsung.com>

Wed, 5 Jul 2017 04:55:22 +0000 (13:55 +0900)
author dongsug.song <dongsug.song@samsung.com>
Wed, 5 Jul 2017 04:55:09 +0000 (13:55 +0900)
committer dongsug.song <dongsug.song@samsung.com>
Wed, 5 Jul 2017 04:55:22 +0000 (13:55 +0900)
diff --cc NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/App.cs

index 0b2bf00,1d849c8..1d849c8

mode 100755,100644..100755
--- 1/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/App.cs
--- 2/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/App.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/App.cs
diff --cc NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusData.cs

index 3a2c4e9,39ab573..39ab573

mode 100755,100644..100755
--- 1/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusData.cs
--- 2/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusData.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusData.cs
diff --cc NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs

index 998e6ac,4faa23d..4faa23d

mode 100755,100644..100755
--- 1/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs
--- 2/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs
+++ b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs
author	dongsug.song <dongsug.song@samsung.com>
	Wed, 5 Jul 2017 04:55:09 +0000 (13:55 +0900)
committer	dongsug.song <dongsug.song@samsung.com>
	Wed, 5 Jul 2017 04:55:22 +0000 (13:55 +0900)
		1	2
NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/App.cs	patch \|	diff1 \|	diff2 \|	blob \| history
NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusData.cs	patch \|	diff1 \|	diff2 \|	blob \| history
NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs	patch \|	diff1 \|	diff2 \|	blob \| history