From: Rui Marinho <me@ruimarinho.net>
Date: Mon, 28 Oct 2019 11:19:17 +0000 (+0000)
Subject: Merge branch '4.4.0'
X-Git-Tag: accepted/tizen/5.5/unified/20200421.150457~117
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=020be3d36b1931d25e63d56d02f5cf6281b9daf5;p=platform%2Fcore%2Fcsapi%2Fxsf.git

Merge branch '4.4.0'
---

020be3d36b1931d25e63d56d02f5cf6281b9daf5
diff --cc Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
index e594ea7,c40facc..5da362b
--- a/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
@@@ -21,9 -21,9 +21,10 @@@
      <Compile Include="$(MSBuildThisFileDirectory)CollectionViewItemsUpdatingScrollMode.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue3475.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue6476.cs" />
 +    <Compile Include="$(MSBuildThisFileDirectory)Issue7396.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue7825.cs" />
      <Compile Include="$(MSBuildThisFileDirectory)Issue5354.xaml.cs">
+       <DependentUpon>Issue5354.xaml</DependentUpon>
        <SubType>Code</SubType>
      </Compile>
      <Compile Include="$(MSBuildThisFileDirectory)Issue5868.cs" />