Alexandre Zollinger Chohfi 8ba9ed4176 Merge branch 'main' into winui ... # Conflicts: # CommunityToolkit.WinUI.UI.Controls.Core.Design/CommunityToolkit.WinUI.UI.Controls.Core.DesignTools.csproj # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/DropShadowPanel.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/ImageEx.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/InAppNotification.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/Loading.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/Menu.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/MenuItem.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/RotatorTile.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/ScrollHeader.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/TabbedCommandBar.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/TabbedCommandBarItem.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/TextToolbar.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Controls/TileControl.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Core.Design/Icons/CommunityToolkit.WinUI.UI.Controls.Menu.icon.png # CommunityToolkit.WinUI.UI.Controls.Core.Design/Icons/CommunityToolkit.WinUI.UI.Controls.RotatorTile.icon.png # CommunityToolkit.WinUI.UI.Controls.Core.Design/Icons/Menu.icon.png # CommunityToolkit.WinUI.UI.Controls.Core.Design/Icons/RotatorTile.icon.png # CommunityToolkit.WinUI.UI.Controls.Core.Design/Properties/Resources.Designer.cs # CommunityToolkit.WinUI.UI.Controls.DataGrid.Design/CommunityToolkit.WinUI.UI.Controls.DataGrid.DesignTools.csproj # CommunityToolkit.WinUI.UI.Controls.DataGrid.Design/Controls/DataGrid.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.DataGrid.Design/Properties/Resources.Designer.cs # CommunityToolkit.WinUI.UI.Controls.DataGrid/Properties/Resources.Designer.cs # CommunityToolkit.WinUI.UI.Controls.Input.Design/CommunityToolkit.WinUI.UI.Controls.Input.DesignTools.csproj # CommunityToolkit.WinUI.UI.Controls.Input.Design/Controls/RangeSelector.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Input.Design/Controls/RichSuggestBox.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Input.Design/Properties/Resources.Designer.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/CommunityToolkit.WinUI.UI.Controls.Layout.DesignTools.csproj # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Controls/BladeItem.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Controls/BladeView.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Controls/Carousel.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Controls/Expander.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Controls/GridSplitter.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Controls/LayoutTransitionControl.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Controls/ListDetailsView.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Controls/OrbitView.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Layout.Design/Properties/Resources.Designer.cs # CommunityToolkit.WinUI.UI.Controls.Markdown.Design/CommunityToolkit.WinUI.UI.Controls.Markdown.DesignTools.csproj # CommunityToolkit.WinUI.UI.Controls.Markdown.Design/Controls/MarkdownTextBlock.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Markdown.Design/Properties/Resources.Designer.cs # CommunityToolkit.WinUI.UI.Controls.Media.Design/CommunityToolkit.WinUI.UI.Controls.Media.DesignTools.csproj # CommunityToolkit.WinUI.UI.Controls.Media.Design/Properties/Resources.Designer.cs # CommunityToolkit.WinUI.UI.Controls.Primitives.Design/CommunityToolkit.WinUI.UI.Controls.Primitives.DesignTools.csproj # CommunityToolkit.WinUI.UI.Controls.Primitives.Design/Controls/AdaptiveGridView.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Primitives.Design/Controls/WrapPanel.Metadata.cs # CommunityToolkit.WinUI.UI.Controls.Primitives.Design/Properties/Resources.Designer.cs # Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.Menu.icon.png # Microsoft.Toolkit.Uwp.UI.Controls.Core.Design/Icons/Microsoft.Toolkit.Uwp.UI.Controls.RotatorTile.icon.png # build/Windows.Toolkit.VisualStudio.Design.props		2021-10-14 13:05:32 -07:00
..
Controls	Merge branch 'main' into winui	2021-10-14 13:05:32 -07:00
Properties	Merge branch 'main' into winui	2021-10-14 13:05:32 -07:00
CommunityToolkit.WinUI.UI.Controls.DataGrid.DesignTools.csproj	Merge branch 'main' into winui	2021-10-14 13:05:32 -07:00