diff --git a/.gitignore b/.gitignore index 7c1fe6399f1..5c65fd6323f 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/Maintenance/git/global-gitignore b/Maintenance/git/global-gitignore deleted file mode 100644 index 4b336031f29..00000000000 --- a/Maintenance/git/global-gitignore +++ /dev/null @@ -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