X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f4f03348bd07609e258eb3b545bdafc2c881847..a28f8d4f0a7734d65dafa41486ca0ab78038a975:/.gitignore

diff --git a/.gitignore b/.gitignore
index 4eb43f02c5..bcbbdbee8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@
 *.plist
 *.trace
 *.class
+.cproject # Eclipse cruft
 \#*
 .attach_pid* 
 smpitmp-*
@@ -39,6 +40,7 @@ SimGrid-*.tar.gz
 simgrid.jar
 ### Unit files
 src/simgrid_units_main.c
+src/*_unit.cpp
 src/*_unit.c
 ### Generated files
 _*.c
@@ -159,7 +161,6 @@ examples/msg/irc_isend/peer
 examples/msg/irc_isend/toto.txt
 examples/msg/kademlia/kademlia
 examples/msg/masterslave/masterslave_arg
-examples/msg/masterslave/masterslave_bypass
 examples/msg/masterslave/masterslave_cluster
 examples/msg/masterslave/masterslave_console
 examples/msg/masterslave/masterslave_failure
@@ -202,7 +203,6 @@ examples/msg/simulation.trace
 examples/msg/start_kill_time/sk_time
 examples/msg/suspend/suspend
 examples/msg/tasks.trace
-examples/msg/token_ring/token_bypass
 examples/msg/token_ring/token_ring
 examples/msg/toto.txt
 examples/msg/trace/test_trace_integration
@@ -273,6 +273,7 @@ src/replay/replay
 src/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/mc/dwarf/dwarf
 teshsuite/mc/dwarf_expression/dwarf-expression
@@ -604,6 +605,7 @@ teshsuite/smpi/mpich3-test/coll/scatter2
 teshsuite/smpi/mpich3-test/coll/scatter3
 teshsuite/smpi/mpich3-test/coll/scattern
 teshsuite/smpi/mpich3-test/coll/scatterv
+teshsuite/smpi/mpich3-test/coll/tmp*
 teshsuite/smpi/mpich3-test/coll/uoplong
 teshsuite/smpi/mpich3-test/comm/cmfree
 teshsuite/smpi/mpich3-test/comm/cmsplit
@@ -1049,8 +1051,10 @@ examples/java/async/java_async_compiled
 examples/java/bittorrent/java_bittorrent_compiled
 examples/java/chord/java_chord_compiled
 examples/java/cloud/java_cloud_compiled
+examples/java/cloud/energy/java_cloud_energy_compiled
 examples/java/cloud/migration/java_cloud_migration_compiled
 examples/java/commTime/java_commTime_compiled
+examples/java/energy/java_energy_compiled
 examples/java/io/java_io_compiled
 examples/java/kademlia/java_kademlia_compiled
 examples/java/master_slave_bypass/java_master_slave_bypass_compiled
@@ -1066,9 +1070,6 @@ examples/java/tracing/java_tracing_compiled
 examples/java/reservationSurfPlugin/java_reservation_surf_plugin_compiled
 examples/java/surfCpuModel/java_surf_cpu_model_compiled
 examples/java/surfPlugin/java_surf_plugin_compiled
-examples/scala/master_slave_bypass/scala_master_slave_bypass_compiled
-examples/scala/master_slave_kill/scala_master_slave_kill_compiled
-examples/scala/masterslave/scala_masterslave_compiled
 /CMakeCache.txt
 examples/smpi/mc/smpi_bugged1
 examples/smpi/mc/smpi_bugged1_liveness