Stone_Red/DesktopMagic
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/DesktopMagic.git synced 2026-09-04 08:56:15 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge branch 'develop'

Browse Source 
# Conflicts:
#	update/DesktopMagic.zip
#	update/updateInfo.json
This commit is contained in:
Stone-Red-Code
2021-11-06 19:04:04 +01:00
parent 921d6dfc20
commit ed84fe37ed
50 changed files with 1730 additions and 1333 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -12,6 +12,7 @@ obj/
*.user
*.userosscache
*.sln.docstates
*GPUCache/
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs