projects / platform / core / csapi / tizenfx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: eb9176f f522e54)
Merge "[NUI-252] change string type of property to enum type of property" into tizen
authordongsug song <dongsug.song@samsung.com>
Fri, 14 Apr 2017 03:22:28 +0000 (20:22 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 14 Apr 2017 03:22:29 +0000 (20:22 -0700)
1  2 
src/Tizen.NUI/src/public/CameraActor.cs patch | diff1 | diff2 | blob | history
src/Tizen.NUI/src/public/CustomView/Spin.cs patch | diff1 | diff2 | blob | history
src/Tizen.NUI/src/public/CustomView/VisualView.cs patch | diff1 | diff2 | blob | history
src/Tizen.NUI/src/public/View.cs patch | diff1 | diff2 | blob | history
src/Tizen.NUI/src/public/VisualMaps.cs patch | diff1 | diff2 | blob | history

diff --cc src/Tizen.NUI/src/public/CustomView/Spin.cs
index df4a483,efa4161..1cb374d
--- 1/src/Tizen.NUI/src/public/CustomView/Spin.cs
--- 2/src/Tizen.NUI/src/public/CustomView/Spin.cs
+++ b/src/Tizen.NUI/src/public/CustomView/Spin.cs
@@@ -378,4 -378,4 +378,4 @@@ namespace Tizen.NU
              }
          }
      }
--}
++}
diff --cc src/Tizen.NUI/src/public/View.cs
Simple merge
Domain: Dotnet / Frameworks;