projects
/
platform
/
core
/
csapi
/
xsf.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
86650d4
39de9f0
)
Merge branch '4.2.0'
author
Samantha Houts
<samantha.houts@xamarin.com>
Sat, 17 Aug 2019 00:54:38 +0000
(17:54 -0700)
committer
Samantha Houts
<samantha.houts@xamarin.com>
Sat, 17 Aug 2019 00:54:38 +0000
(17:54 -0700)
1
2
.nuspec/Xamarin.Forms.nuspec
patch
|
diff1
|
diff2
|
blob
|
history
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs
patch
|
diff1
|
diff2
|
blob
|
history
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
patch
|
diff1
|
diff2
|
blob
|
history
Xamarin.Forms.Maps.Tizen/MapRenderer.cs
patch
|
diff1
|
diff2
|
blob
|
history
Xamarin.Forms.Material.Tizen/MaterialSliderRenderer.cs
patch
|
diff1
|
diff2
|
blob
|
history
Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs
patch
|
diff1
|
diff2
|
blob
|
history
Xamarin.Forms.Platform.Android/Platform.cs
patch
|
diff1
|
diff2
|
blob
|
history
Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
.nuspec/Xamarin.Forms.nuspec
Simple merge
diff --cc
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/TestPages/TestPages.cs
Simple merge
diff --cc
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
Simple merge
diff --cc
Xamarin.Forms.Maps.Tizen/MapRenderer.cs
Simple merge
diff --cc
Xamarin.Forms.Material.Tizen/MaterialSliderRenderer.cs
Simple merge
diff --cc
Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs
Simple merge
diff --cc
Xamarin.Forms.Platform.Android/Platform.cs
Simple merge
diff --cc
Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs
index
d6707da
,
aecc175
..
eae7dcd
---
1
/
Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs
---
2
/
Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs
+++ b/
Xamarin.Forms.Platform.iOS/Extensions/Extensions.cs
@@@
-1,4
-1,4
+1,5
@@@
+using Foundation;
+ using System;
using UIKit;
using Xamarin.Forms.Internals;