Merge the file Maintenance/git/global-gitignore into .gitignore

That is simpler to use: no need of a call to git-config.
This commit is contained in:
Laurent Rineau 2012-11-14 16:07:15 +01:00
parent 4413cdb5c3
commit 5deb7b6cf7
2 changed files with 84 additions and 84 deletions

84
.gitignore vendored
View File

@ -1422,3 +1422,87 @@ Triangulation_3/test/Triangulation_3/test_triangulation_3
Triangulation_3/test/Triangulation_3/test_triangulation_tds
Triangulation_3/test/Triangulation_3/test_triangulation_tds_3
/build*
*.bak
*.bk?
*.old
.DS_Store
*.a
*.o
*.lib
*.dll
*.exe
*.so
*.so.*
debug
release
Debug
Release
x64
*.blg
*.cgallog
*.aux
*.maf
*.hax
*.hlg
*.ilg
*.pdflg
*.log
*.toc
*.cgallog.tmp*
*.inc
*.dvi
*.mtc*
*.idx
ProgramOutput*
ErrorOutput*
CompilerOutput*
error.txt
*.ncb
*.suo
contents.obv
.xvpics
semantic.cache
doc_ps
doc_html
doc_pdf
*.moc
.*~
*~
.#*
*.user
*.aps
doc_doxygen
CMakeCache.txt
CMakeFiles
cmake_install.cmake
Doxyfile
*.dir
ALL_BUILD.vcproj
ZERO_CHECK.vcproj
gmon.*
.qglviewer.xml
*.moc_parameters
*.cpp_parameters
*_moc.cpp
ui_*.h
qrc_*.cxx
*.sbr
.dir-locals.el
*.tmp
*.ilk
*.pdb
*.exe.*
Makefile
*.cpp.noheader
*.h.noheader
*.h.filename
*.cpp.filename
.scm-urls
*.exp
*.resource.txt
*.manifest
*.manifest.res
*.vcproj
*.sln
*.depends

View File

@ -1,84 +0,0 @@
*.bak
*.bk?
*.old
.DS_Store
*.a
*.o
*.lib
*.dll
*.exe
*.so
*.so.*
debug
release
Debug
Release
x64
*.blg
*.cgallog
*.aux
*.maf
*.hax
*.hlg
*.ilg
*.pdflg
*.log
*.toc
*.cgallog.tmp*
*.inc
*.dvi
*.mtc*
*.idx
ProgramOutput*
ErrorOutput*
CompilerOutput*
error.txt
*.ncb
*.suo
contents.obv
.xvpics
semantic.cache
doc_ps
doc_html
doc_pdf
*.moc
.*~
*~
.#*
*.user
*.aps
doc_doxygen
CMakeCache.txt
CMakeFiles
cmake_install.cmake
Doxyfile
*.dir
ALL_BUILD.vcproj
ZERO_CHECK.vcproj
gmon.*
.qglviewer.xml
*.moc_parameters
*.cpp_parameters
*_moc.cpp
ui_*.h
qrc_*.cxx
*.sbr
.dir-locals.el
*.tmp
*.ilk
*.pdb
*.exe.*
Makefile
*.cpp.noheader
*.h.noheader
*.h.filename
*.cpp.filename
.scm-urls
*.exp
*.resource.txt
*.manifest
*.manifest.res
*.vcproj
*.sln
*.depends