summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Core
diff options
context:
space:
mode:
authorKangho Hur <kangho.hur@samsung.com>2017-02-03 06:21:16 (GMT)
committerKangho Hur <kangho.hur@samsung.com>2017-10-23 04:34:28 (GMT)
commit7f5c8541bca2d794efa653dc20e3f4226dfa1a50 (patch)
treea1658bf27a0930b4f8763dd4614bba6ca153d4c6 /Xamarin.Forms.Core
parent8ff5de6c8ea187fcb57a4dda2bf10ea71c630e3b (diff)
downloadxamarin-forms-7f5c8541bca2d794efa653dc20e3f4226dfa1a50.zip
xamarin-forms-7f5c8541bca2d794efa653dc20e3f4226dfa1a50.tar.gz
xamarin-forms-7f5c8541bca2d794efa653dc20e3f4226dfa1a50.tar.bz2
Rebase Forms to upstream lastest (2.3.4-pre2)
- Synced with 3c7b291. (https://github.com/xamarin/Xamarin.Forms/commit/3c7b2918b3065a81ecb4040fde09d93aae09f62d) - [Core] Device.Tizen has been added newly. - Package version has updated to 2.3.4-r190-001 Change-Id: I948fd73212744aa8c1941dc6a6d8e46eb29523af
Diffstat (limited to 'Xamarin.Forms.Core')
-rw-r--r--[-rwxr-xr-x]Xamarin.Forms.Core/Device.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Xamarin.Forms.Core/Device.cs b/Xamarin.Forms.Core/Device.cs
index bf5b2d4..f1b3554 100755..100644
--- a/Xamarin.Forms.Core/Device.cs
+++ b/Xamarin.Forms.Core/Device.cs
@@ -17,6 +17,7 @@ namespace Xamarin.Forms
public const string UWP = "UWP";
public const string WinRT = "WinRT";
public const string macOS = "macOS";
+ public const string Tizen = "Tizen";
[EditorBrowsable(EditorBrowsableState.Never)]
public static DeviceInfo info;
@@ -210,4 +211,4 @@ namespace Xamarin.Forms
public static readonly Style CaptionStyle = new Style(typeof(Label)) { BaseResourceKey = CaptionStyleKey };
}
}
-} \ No newline at end of file
+}