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

[simgrid.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9d1bf7e..6c39838 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -116,21 +116,19 @@ tags
 callgrind.out.*
 ### Examples and traces
 *.exe
-examples/msg/actions-mpi/actions-mpi
+examples/msg/actions-comm/actions-comm
 examples/msg/actions-storage/actions-storage
 examples/msg/async-wait/async-wait
 examples/msg/async-waitall/async-waitall
 examples/msg/async-waitany/async-waitany
-examples/msg/bittorrent/bittorrent
-examples/msg/bittorrent/bittorrent_platfgen
-examples/msg/chainsend/chainsend
-examples/msg/cloud/bound
-examples/msg/cloud/master_worker_vm
-examples/msg/cloud/migrate_vm
-examples/msg/cloud/multicore
-examples/msg/cloud/scale
-examples/msg/cloud/simple_vm
-examples/msg/cloud/two_tasks_vm
+examples/msg/app-bittorrent/bittorrent
+examples/msg/app-chainsend/chainsend
+examples/msg/cloud-capping/cloud-capping
+examples/msg/cloud-masterworker/cloud-masterworker
+examples/msg/cloud-migration/cloud-migration
+examples/msg/cloud-multicore/cloud-multicore
+examples/msg/cloud-simple/cloud-simple
+examples/msg/cloud-two-tasks/cloud-two-tasks
 examples/msg/dht-chord/dht-chord
 examples/msg/dht-kademlia/dht-kademlia
 examples/msg/dht-pastry/dht-pastry
@@ -143,10 +141,9 @@ examples/msg/io-file/io-file
 examples/msg/io-file-unlink/io-file-unlink
 examples/msg/io-remote/io-remote
 examples/msg/io-storage/io-storage
-examples/msg/failures/failures
-examples/msg/masterworker/masterworker
+examples/msg/platform-failures/platform-failures
 examples/msg/process-kill/process-kill
-examples/msg/masterworker-mailbox/masterworker-mailbox
+examples/msg/app-masterworker/app-masterworker
 examples/msg/mc/bugged1
 examples/msg/mc/bugged1_liveness
 examples/msg/mc/bugged1_stateful
@@ -164,27 +161,26 @@ examples/msg/mc/test/snapshot_comparison4
 examples/msg/mc/test/snapshot_comparison5
 examples/msg/process-migration/process-migration
 examples/msg/ms.trace
-examples/msg/ns3/ns3
-examples/msg/pmm/pmm
+examples/msg/network-ns3/network-ns3
+examples/msg/app-pmm/app-pmm
 examples/msg/task-priority/task-priority
 examples/msg/procmig.trace
-examples/msg/properties/properties
-examples/msg/synchro/synchro
-examples/msg/sendrecv/sendrecv
-examples/msg/set-maestro/set-maestro
+examples/msg/platform-properties/platform-properties
+examples/msg/synchro-semaphore/synchro-semaphore
+examples/msg/app-pingpong/app-pingpong
+examples/msg/maestro-set/maestro-set
 examples/msg/simulation.trace
+examples/msg/process-create/process-create
 examples/msg/process-startkilltime/process-startkilltime
 examples/msg/process-suspend/process-suspend
-examples/msg/token_ring/token_ring
-examples/msg/trace/test_trace_integration
+examples/msg/app-token-ring/app-token-ring
 examples/msg/trace-categories/trace-categories
-examples/msg/trace-link-srcdst-user-variables/trace-link-srcdst-user-variables
+examples/msg/trace-route-user-variables/trace-route-user-variables
 examples/msg/trace-link-user-variables/trace-link-user-variables
 examples/msg/trace-masterworker/trace-masterworker
 examples/msg/trace-process-migration/trace-process-migration
-examples/msg/trace-simple/trace-simple
 examples/msg/trace-platform/trace-platform
-examples/msg/trace-user-variables/trace-user-variables
+examples/msg/trace-host-user-variables/trace-host-user-variables
 examples/s4u/basic/s4u_basic
 examples/s4u/io/s4u_io
 examples/simdag/daxload/sd_daxload