Merge branch 'feature/sourcetracing' into develop

[clinton/Virtual-Jaguar-Rx.git] / .gitignore

diff --git a/.gitignore b/.gitignore
dissimilarity index 87%
index a3660b8..d3a73c2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,37 +1,36 @@
-/Assets/\r
-/debug/\r
-/eeproms/\r
-/obj/\r
-/release/\r
-/Screenshots/\r
-/software/\r
-/src/*~\r
-/src/*/*.bak\r
-/src/m68000/obj/*.a\r
-/src/m68000/obj/*.exe\r
-/src/m68000/obj/*.d\r
-/src/m68000/obj/*.o\r
-*.bak\r
-makefile-qt\r
-makefile-qt*.*\r
-object_script.virtualjaguar*.*\r
-.qmake.stash\r
-virtualjaguar.WinMerge\r
-/Win-VS2015/\r
-/Win-VS2017/m68000/m68000.vcxproj.user\r
-/Win-VS2017/jaguarcore/jaguarcore.vcxproj.user\r
-/Win-VS2017/x64/Archives/\r
-/Win-VS2017/*/x64/\r
-/Win-VS2017/*/ReadMe.txt\r
-/Win-VS2017/.vs/\r
-/Win-VS2017/obj/\r
-/Win-VS2017/Win32/\r
-/Win-VS2017/x64/\r
-/Win-VS2017/virtualjaguar.VC.db\r
-/Win-VS2017/virtualjaguar.VC.VC.opendb\r
-/Win-VS2017/virtualjaguar.sdf\r
-/Win-VS2017/virtualjaguar.vcxproj.user\r
-/Win-VS2017/GeneratedFiles/\r
-/Win-VS2017/GeneratedFiles/qrc_virtualjaguar.cpp\r
-/Win-VS2017/My Inspector Results - virtualjaguar\r
-/Win-VS2019/
+Assets/\r
+debug/\r
+eeproms/\r
+obj/\r
+release/\r
+Screenshots/\r
+software/\r
+src/*~\r
+src/*/*.bak\r
+src/m68000/obj/*.a\r
+src/m68000/obj/*.exe\r
+src/m68000/obj/*.d\r
+src/m68000/obj/*.o\r
+*.bak\r
+makefile-qt\r
+makefile-qt*.*\r
+object_script.virtualjaguar*.*\r
+.qmake.stash\r
+virtualjaguar.WinMerge\r
+Win-VS2017/m68000/m68000.vcxproj.user\r
+Win-VS2017/jaguarcore/jaguarcore.vcxproj.user\r
+Win-VS2017/x64/Archives/\r
+Win-VS2017/*/x64/\r
+Win-VS2017/*/ReadMe.txt\r
+Win-VS2017/.vs/\r
+Win-VS2017/obj/\r
+Win-VS2017/Win32/\r
+Win-VS2017/x64/\r
+Win-VS2017/virtualjaguar.VC.db\r
+Win-VS2017/virtualjaguar.VC.VC.opendb\r
+Win-VS2017/virtualjaguar.sdf\r
+Win-VS2017/virtualjaguar.vcxproj.user\r
+Win-VS2017/GeneratedFiles/\r
+Win-VS2017/GeneratedFiles/qrc_virtualjaguar.cpp\r
+Win-VS2015/\r
+Win-VS2019/