X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/51d1cd2b1ec0cb0699045e10c2fbbdd19ae36a85..f8298031ff06655899a402fc0adc3fb64e8aaeb3:/.gitignore

diff --git a/.gitignore b/.gitignore
index c9dea59da0..b55a3eca2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,6 +96,7 @@ doc/realtoc.sh
 doc/tmp.realtoc
 doc/using_bib.html
 doc/Doxyfile
+doc/doxygen_sqlite3.db
 doc/footer.html
 *.doc.toc
 doc/latex/
@@ -105,6 +106,7 @@ doc/simgrid.tag
 doc/doxygen/logcategories.doc
 doc/index-API.doc
 doc/simgrid_modules.map
+doc/javadoc
 ### Specific of project 
 .settings/
 .csettings/
@@ -138,9 +140,9 @@ examples/msg/cloud/multicore
 examples/msg/cloud/scale
 examples/msg/cloud/simple_vm
 examples/msg/cloud/two_tasks_vm
-examples/msg/energy/pstate/pstate
+examples/msg/energy/consumption/energy_consumption
 examples/msg/energy/onoff/onoff
-examples/msg/energy/e2/e2
+examples/msg/energy/pstate/pstate
 examples/msg/energy/e3/e3
 examples/msg/pastry/pastry
 examples/msg/semaphores/synchro
@@ -178,6 +180,7 @@ examples/msg/icomms/toto.txt
 examples/msg/masterslave/masterslave_console
 examples/msg/irc_isend/peer
 examples/msg/irc_isend/toto.txt
+examples/msg/ns3/ns3
 examples/simdag/sd_avail
 examples/simdag/ex_sd_seq_access
 examples/simdag/sd_seq_access
@@ -200,6 +203,7 @@ examples/simdag/goal/goal_test
 examples/simdag/scheduling/minmin_test
 examples/simdag/io/sd_io
 examples/msg/actions/actions
+examples/msg/actions/storage_actions
 examples/msg/bittorrent/bittorrent
 examples/msg/bittorrent/bittorrent_platfgen
 examples/msg/kademlia/kademlia
@@ -968,6 +972,8 @@ teshsuite/msg/task_destroy_cancel/task_destroy_cancel
 teshsuite/msg/pid/pid
 teshsuite/msg/get_sender/get_sender
 teshsuite/msg/trace/test_trace_integration
+teshsuite/msg/host_on_off/host_on_off_recv
+teshsuite/msg/host_on_off/host_on_off_wait
 teshsuite/simix/check_defaults/check_defaults
 teshsuite/simix/stack_overflow/stack_overflow
 teshsuite/simdag/availability/availability_test
@@ -1045,9 +1051,13 @@ 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
 teshsuite/mc/dwarf/dwarf
 teshsuite/mc/dwarf_expression/dwarf-expression
+teshsuite/mc/replay/random_bug
 examples/smpi/mc/smpi_bugged1
 examples/smpi/mc/smpi_bugged1_liveness
 examples/smpi/mc/smpi_bugged2