tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

ignore conflict files

This commit is contained in:
Campbell Barton 2014-08-08 05:47:15 +10:00
parent 9a8e889dfc
commit 7d20ad6a1b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -11,6 +11,10 @@ __pycache__/
*.swo
*#
# conflicts
*.orig
*.rej
# QtCreator
CMakeLists.txt.user