Merge branch 'master' into vmtrace

[simgrid.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c842dca..ebd756a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -74,6 +74,7 @@ lib/
 manpages/
 build_dir/
 build/
+buildtools/Cmake/memcheck_tests.cmake
 buildtools/Cmake/test_prog/prog_va_copy.c
 
 
@@ -98,6 +99,8 @@ doc/user_guide/html
 doc/user_guide/latex
 doc/ref_guide/html
 doc/ref_guide/latex
+doc/dev_guide/html
+doc/dev_guide/latex
 doc/index.php
 doc/simgrid.tag
 doc/publis_core.bib
@@ -109,17 +112,22 @@ doc/publis_intra.bib
 doc/publis_intra_bib.html
 doc/ref_guide/doxygen/RefGuideDoxyfile
 doc/user_guide/doxygen/UserGuideDoxyfile
+doc/dev_guide/doxygen/DevGuideDoxyfile
 doc/ref_guide/doxygen/logcategories.doc
 doc/user_guide/doxygen/logcategories.doc
+doc/dev_guide/doxygen/logcategories.doc
 doc/ref_guide/doxygen/simgrid_modules.map
 doc/user_guide/doxygen/simgrid_modules.map
+doc/dev_guide/doxygen/simgrid_modules.map
 doc/index-API.doc
 doc/ref_guide/doxygen/index-API.doc
 doc/user_guide/doxygen/index-API.doc
+doc/dev_guide/doxygen/index-API.doc
 doc/simgrid_modules.map
 doc/logcategories.doc
 doc/shared/doxygen/simgridrefguide.tag
 doc/shared/doxygen/simgriduserguide.tag
+doc/shared/doxygen/simgriddevguide.tag
 
 ################################################
 ### Specific of project 
@@ -262,6 +270,12 @@ examples/msg/parallel_contexts/pcontexts
 examples/msg/parallel_contexts/pcontexts2
 examples/msg/pmm/msg_pmm
 examples/smpi/toto.txt
+examples/smpi/MM/MM_mpi
+examples/smpi/hvector_test
+examples/smpi/indexed_test
+examples/smpi/smpi_replay
+examples/smpi/struct_test
+examples/smpi/vector_test
 examples/smpi/replay
 examples/smpi/reduce
 examples/smpi/bcast