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

[simgrid.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c1bdf8a..7fd94e2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -115,8 +115,14 @@ tags
 callgrind.out.*
 ### Examples and traces
 *.exe
+doc/msg-tuto-src/masterworker0
+doc/msg-tuto-src/masterworker1
+doc/msg-tuto-src/masterworker2
+doc/msg-tuto-src/masterworker3
+doc/msg-tuto-src/masterworker4
 examples/msg/actions-comm/actions-comm
 examples/msg/actions-storage/actions-storage
+examples/msg/async-yield/async-yield
 examples/msg/async-wait/async-wait
 examples/msg/async-waitall/async-waitall
 examples/msg/async-waitany/async-waitany
@@ -180,8 +186,12 @@ examples/msg/trace-masterworker/trace-masterworker
 examples/msg/trace-process-migration/trace-process-migration
 examples/msg/trace-platform/trace-platform
 examples/msg/trace-host-user-variables/trace-host-user-variables
+examples/s4u/actions-comm/s4u_actions-comm
 examples/s4u/basic/s4u_basic
+examples/s4u/basic/s4u_basic_deployment
+examples/s4u/basic/s4u_basic_function
 examples/s4u/io/s4u_io
+examples/s4u/mutex/s4u_mutex
 examples/simdag/daxload/sd_daxload
 examples/simdag/dag-dotload/sd_dag-dotload
 examples/simdag/ptg-dotload/sd_ptg-dotload
@@ -195,7 +205,6 @@ examples/simdag/throttling/sd_throttling
 examples/simdag/fail/sd_fail
 examples/simdag/test/sd_test
 examples/simdag/typed_tasks/sd_typed_tasks
-examples/smpi/bcbench/smpi_bcbench
 examples/smpi/energy/f77/sef
 examples/smpi/energy/f90/sef90
 examples/smpi/energy/smpi_energy
@@ -210,7 +219,6 @@ examples/smpi/mc/send_deterministic
 examples/smpi/NAS/dt
 examples/smpi/NAS/ep
 examples/smpi/NAS/is
-examples/smpi/mvmul/smpi_mvmul
 examples/smpi/replay_multiple/replay_multiple
 examples/smpi/replay/one_trace
 examples/smpi/ring_c
@@ -280,6 +288,7 @@ teshsuite/smpi/coll-bcast/coll-bcast
 teshsuite/smpi/coll-barrier/coll-barrier
 teshsuite/smpi/coll-gather/coll-gather
 teshsuite/smpi/macro-sample/macro-sample
+teshsuite/smpi/timers/timers
 teshsuite/smpi/type-hvector/type-hvector
 teshsuite/smpi/type-indexed/type-indexed
 teshsuite/smpi/isp/umpire/abort
@@ -970,12 +979,16 @@ examples/java/app/bittorrent/java_app_bittorrent_compiled
 examples/java/app/centralizedmutex/java_app_centralizedmutex_compiled
 examples/java/app/masterworker/java_app_masterworker_compiled
 examples/java/app/pingpong/java_app_pingpong_compiled
+examples/java/app/tokenring/java_app_tokenring_compiled
+examples/java/async/yield/java_async_yield_compiled
 examples/java/async/dsend/java_async_dsend_compiled
+examples/java/async/waitall/java_async_waitall_compiled
 examples/java/dht/chord/java_dht_chord_compiled
 examples/java/dht/kademlia/java_dht_kademlia_compiled
 examples/java/cloud/masterworker/java_cloud_masterworker_compiled
 examples/java/cloud/migration/java_cloud_migration_compiled
 examples/java/energy/consumption/java_energy_consumption_compiled
+examples/java/energy/pstate/java_energy_pstate_compiled
 examples/java/energy/vm/java_energy_vm_compiled
 examples/java/io/file/java_io_file_compiled
 examples/java/io/storage/java_io_storage_compiled