Merge branch 'master' into HEAD
commit
c0b940d0a7
|
@ -2,7 +2,10 @@
|
|||
build*/*
|
||||
*.so
|
||||
public/
|
||||
<<<<<<< HEAD
|
||||
*.exe
|
||||
=======
|
||||
>>>>>>> master
|
||||
|
||||
# Eclispe setting --- do not ignore *.cproject and *.project
|
||||
*/**/.settings
|
||||
|
@ -92,7 +95,11 @@ DocProject/Help/Html2
|
|||
DocProject/Help/html
|
||||
|
||||
# Cmake, make and compiled objects on unix
|
||||
<<<<<<< HEAD
|
||||
#*.cmake
|
||||
=======
|
||||
*.cmake
|
||||
>>>>>>> master
|
||||
*.c.o
|
||||
*/CMakeFiles/*
|
||||
*/Makefile
|
||||
|
@ -142,6 +149,20 @@ Assets/AssetStoreTools*
|
|||
# Visual Studio cache directory
|
||||
.vs/
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
# Visual Studio Code cache directory
|
||||
.vscode/*
|
||||
!.vscode/settings.json
|
||||
!.vscode/tasks.json
|
||||
!.vscode/launch.json
|
||||
!.vscode/extensions.json
|
||||
*.code-workspace
|
||||
|
||||
# Local History for Visual Studio Code
|
||||
.history/
|
||||
|
||||
>>>>>>> master
|
||||
# Autogenerated VS/MD/Consulo solution and project files
|
||||
ExportedObj/
|
||||
.consulo/
|
||||
|
@ -175,8 +196,11 @@ sysinfo.txt
|
|||
|
||||
# Office
|
||||
~*.pptx
|
||||
<<<<<<< HEAD
|
||||
|
||||
# Pytest
|
||||
.cache
|
||||
.pytest_cache
|
||||
.mypy_cache
|
||||
.mypy_cache
|
||||
=======
|
||||
>>>>>>> master
|
||||
|
|
Loading…
Reference in New Issue