Commit Graph

6 Commits

Author SHA1 Message Date
Campbell Barton
37c56e10cd Revert "ignore conflict files"
This reverts commit 7d20ad6a1ba46cad209d17d144af1cffbab334fc.

turns out this hides conflicts which we may want to see
2014-08-08 06:00:49 +10:00
Campbell Barton
7d20ad6a1b ignore conflict files 2014-08-08 05:47:15 +10:00
Campbell Barton
45846d6779 ignore in-source doc building dirs 2014-07-27 22:04:10 +10:00
Mitchell Stokes
f91368d822 .gitignore: Adding CMakeLists.txt.user for QtCreator users. 2014-01-26 17:52:14 -08:00
Sergey Sharybin
5a4f7f46a5 Ignore *.patch and *.diff files which are in the working tree root 2013-11-22 23:28:35 +06:00
Campbell Barton
345c509239 add gitignore 2013-11-15 18:51:31 +11:00