Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 7362d13..541308e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -42,13 +42,10 @@ src/*_unit.c
 _*.c
 include/simgrid_config.h
 include/xbt/version.h
-include/instr/tracing_config.h
 include/smpi/smpif.h
-src/context_sysv_config.h
 src/internal_config.h
 src/smpi/smpicc
 src/smpi/smpirun
-simgrid-*.tar.gz
 testprog
 ### Cmake files
 CPackConfig.cmake
@@ -61,7 +58,6 @@ install_manifest.txt
 _CPack_Packages/
 CMakeCache.txt
 DartConfiguration.tcl
-simgrid.nsi
 TAGS
 Testing/
 Makefile
@@ -193,6 +189,7 @@ examples/msg/properties/msg_prop
 examples/msg/semaphores/synchro
 examples/msg/sendrecv/sendrecv
 examples/msg/sendrecv/sendrecv_main
+examples/msg/set-maestro/set-maestro
 examples/msg/simulation.trace
 examples/msg/start_kill_time/sk_time
 examples/msg/suspend/suspend
@@ -213,6 +210,8 @@ examples/msg/tracing/volume
 examples/msg/volume.trace
 examples/msg/z_gtnets.trace
 examples/msg/zmsg_test.trace
+examples/s4u/basic/s4u_basic
+examples/s4u/io/s4u_io
 examples/simdag/dax/dax_test
 examples/simdag/dot/dot_test
 examples/simdag/dot/dot_test2