37c56e10cd
This reverts commit 7d20ad6a1ba46cad209d17d144af1cffbab334fc. turns out this hides conflicts which we may want to see
35 lines
406 B
Plaintext
35 lines
406 B
Plaintext
# generic files to ignore
|
|
.*
|
|
|
|
# python temp paths
|
|
__pycache__/
|
|
*.py[cod]
|
|
|
|
# editors
|
|
*~
|
|
*.swp
|
|
*.swo
|
|
*#
|
|
|
|
# QtCreator
|
|
CMakeLists.txt.user
|
|
|
|
# ms-windows
|
|
Thumbs.db
|
|
ehthumbs.db
|
|
Desktop.ini
|
|
|
|
# commonly used paths in blender
|
|
/blender.bin
|
|
/user-config.py
|
|
|
|
# local patches
|
|
/*.patch
|
|
/*.diff
|
|
|
|
# in-source doc-gen
|
|
/doc/doxygen/html/
|
|
/doc/python_api/sphinx-in-tmp/
|
|
/doc/python_api/sphinx-in/
|
|
/doc/python_api/sphinx-out/
|