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

[simgrid.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index a726a58..7362d13 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -138,9 +138,10 @@ examples/msg/cloud/multicore
 examples/msg/cloud/scale
 examples/msg/cloud/simple_vm
 examples/msg/cloud/two_tasks_vm
-examples/msg/energy/consumption/energy_consumption
+examples/msg/energy/consumption/consumption
 examples/msg/energy/onoff/onoff
 examples/msg/energy/pstate/pstate
+examples/msg/energy/vm/vm
 examples/msg/gpu/test_MSG_gpu_task_create
 examples/msg/gtnets/gtnets
 examples/msg/icomms/.kdbgrc.peer3
@@ -232,7 +233,7 @@ examples/simdag/sd_seq_access
 examples/simdag/sd_test
 examples/simdag/sd_test2
 examples/simdag/sd_test_console
-examples/simdag/sd_typed_tasks_test
+examples/simdag/sd_typed_tasks
 examples/simdag/simdag_tracing
 examples/smpi/bcbench
 examples/smpi/energy/f77/sef
@@ -264,8 +265,8 @@ src/replay/replay
 testall
 teshsuite/bug-17132/bug-17132
 teshsuite/datadesc_usage.out
-teshsuite/java/semaphore/java_semaphore_gc_compiled
-teshsuite/java/sleep_host_off/java_sleep_host_off_compiled
+teshsuite/java/SemaphoreGC/SemaphoreGC_compiled
+teshsuite/java/SleepHostOff/SleepHostOff_compiled
 teshsuite/mc/dwarf/dwarf
 teshsuite/mc/dwarf_expression/dwarf-expression
 teshsuite/mc/replay/random_bug