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

diff --git a/.gitignore b/.gitignore
index 4eb43f02c5..7227b38c03 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
@@ -604,6 +606,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 +1052,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