From: dongsug.song <dongsug.song@samsung.com>
Date: Wed, 5 Jul 2017 04:55:09 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: preview1-00180^2~203
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5ddfd77167d8d9527641bbd1c422525d5f3b2cb;hp=3f26318b6ffc47bc2665ee005cc2c02a317a0104;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git

Merge branch 'devel/master' into tizen

Change-Id: I310891667afc680a3fc37226f964b70041b8ea35
---

diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/App.cs b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/App.cs
old mode 100644
new mode 100755
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/Constants.cs b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/Constants.cs
old mode 100644
new mode 100755
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusData.cs b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusData.cs
old mode 100644
new mode 100755
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusEffect.cs b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusEffect.cs
old mode 100644
new mode 100755
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/IFocusEffect.cs b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/IFocusEffect.cs
old mode 100644
new mode 100755
diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs
old mode 100644
new mode 100755