motimat/Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dbus-codegen

Browse Source 
# Conflicts:
#	src/Avalonia.X11/X11Window.cs
This commit is contained in:
affederaffe
2023-02-03 00:43:49 +01:00
parent 625e69fae2 f6cab294c6
commit 82e38d3a07
259 changed files with 5663 additions and 2937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Avalonia.Desktop.slnf
+1
View File
@@ -15,6 +15,7 @@
"src\\Avalonia.Build.Tasks\\Avalonia.Build.Tasks.csproj",
"src\\Avalonia.Controls.ColorPicker\\Avalonia.Controls.ColorPicker.csproj",
"src\\Avalonia.Controls.DataGrid\\Avalonia.Controls.DataGrid.csproj",
"src\\Avalonia.Controls.ItemsRepeater\\Avalonia.Controls.ItemsRepeater.csproj",
"src\\Avalonia.Controls\\Avalonia.Controls.csproj",
"src\\Avalonia.DesignerSupport\\Avalonia.DesignerSupport.csproj",
"src\\Avalonia.Desktop\\Avalonia.Desktop.csproj",