projects / platform / core / csapi / xsf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4c91025 116000f)
Merge branch '3.5.0' into 3.6.0
authorSamantha Houts <samantha.houts@xamarin.com>
Thu, 14 Feb 2019 00:55:00 +0000 (16:55 -0800)
committerSamantha Houts <samantha.houts@xamarin.com>
Thu, 14 Feb 2019 00:55:00 +0000 (16:55 -0800)
1  2 
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems patch | diff1 | diff2 | blob | history

diff --cc Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index 12cfb9e,1dea1f3..8658be4
--- 1/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
--- 2/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
@@@ -14,15 -13,10 +14,13 @@@
        <DependentUpon>Bugzilla60787.xaml</DependentUpon>
        <SubType>Code</SubType>
      </Compile>
-     <Compile Include="$(MSBuildThisFileDirectory)Issue1332.cs" />
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue2102.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue1588.xaml.cs">
        <DependentUpon>Issue1588.xaml</DependentUpon>
        <SubType>Code</SubType>
      </Compile>
-     <Compile Include="$(MSBuildThisFileDirectory)Issue1760_1.cs" />
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue4629.cs" />
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue4384.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue4782.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue4484.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue3509.cs" />
Domain: Dotnet / UI;