Merge pull request MonoGame#4636 from SickheadGames/release_3_5

Release 3.5
johmarjac · Mar 16, 2016 · 21c3235 · 21c3235
2 parents 74fef2d + e19eb72
commit 21c3235
Show file tree

Hide file tree

Showing 729 changed files with 23,039 additions and 17,138 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,8 @@
 *.DS_Store
 
 #Output Linux Installer
-Installers/Linux/InstallerData/
+Installers/Linux/tmp_deb/
+Installers/Linux/tmp_run/
 *.run
 *.deb
 
@@ -31,18 +32,27 @@ Installers/Linux/InstallerData/
 *.lib
 *.sbr
 *.sdf
+*.csproj.csdat
 ipch/
 obj/
 [Bb]in
 [Dd]ebug*/
 [Rr]elease*/
 Ankh.NoLoad
+.vs/
+project.lock.json
+/MonoGame.Framework/MonoGame.Framework.Net.WindowsUniversal.project.lock.json
+/MonoGame.Framework/MonoGame.Framework.WindowsUniversal.project.lock.json
+artifacts/
 
 #Tooling
 _ReSharper*/
 *.resharper
 [Tt]est[Rr]esult*
 
+#Visual Studio Rebracer extension, allows the user to automatically change the style configuration by project
+rebracer.xml
+
 #Subversion files
 .svn
 
@@ -81,3 +91,5 @@ Test/*.csproj
 
 #Zip files
 *.zip
+
+Installers/MacOS/Scripts/Framework/postinstall