projects / platform / core / csapi / xsf.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d91c960 337bd60)
Merge branch '4.3.0' into 4.4.0
authorRui Marinho <me@ruimarinho.net>
Mon, 2 Dec 2019 19:58:50 +0000 (19:58 +0000)
committerRui Marinho <me@ruimarinho.net>
Mon, 2 Dec 2019 19:58:50 +0000 (19:58 +0000)
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 dbd2f50,6e3464d..ed771f2
--- 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
@@@ -1166,9 -1143,7 +1166,10 @@@
        <DependentUpon>Issue7886.xaml</DependentUpon>
      </Compile>
      <Compile Include="$(MSBuildThisFileDirectory)Issue7898.cs" />
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue7249.cs" />
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue8200.cs" />
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue8417.xaml.cs" />
+     <Compile Include="$(MSBuildThisFileDirectory)Issue7510.cs" />
    </ItemGroup>
    <ItemGroup>
      <EmbeddedResource Include="$(MSBuildThisFileDirectory)Bugzilla22229.xaml">
Domain: Dotnet / UI;