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

[simgrid.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ee86ec6..725236b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1059,7 +1059,6 @@ teshsuite/surf/lmm_usage/lmm_usage
 teshsuite/surf/maxmin_bench/maxmin_bench
 teshsuite/surf/surf_usage/surf_usage
 teshsuite/surf/surf_usage2/surf_usage2
-teshsuite/surf/trace_usage/trace_usage
 teshsuite/xbt/heap_bench/heap_bench
 teshsuite/xbt/log_large/log_large
 teshsuite/xbt/log_usage/log_usage
@@ -1074,6 +1073,7 @@ testgraph.xml
 test_rl
 test_sg
 tools/tesh/tesh
+unit_tmgr
 #########################################
 ## touched files to track the dependencies of java examples
 examples/java/app/bittorrent/java_app_bittorrent_compiled