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

[simgrid.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 2770b2c..ccf5ab7 100644 (file)
--- 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,8 +140,9 @@ examples/msg/cloud/multicore
 examples/msg/cloud/scale
 examples/msg/cloud/simple_vm
 examples/msg/cloud/two_tasks_vm
-examples/msg/energy/e1/e1
-examples/msg/energy/e2/e2
+examples/msg/energy/consumption/energy_consumption
+examples/msg/energy/onoff/onoff
+examples/msg/energy/pstate/pstate
 examples/msg/energy/e3/e3
 examples/msg/pastry/pastry
 examples/msg/semaphores/synchro
@@ -1047,8 +1050,6 @@ examples/java/surfPlugin/java_surf_plugin_compiled
 /CMakeCache.txt
 teshsuite/mc/dwarf/dwarf
 teshsuite/mc/dwarf_expression/dwarf-expression
-src/bindings/java/org/simgrid/surf/surfJAVA_wrap.cxx
-src/bindings/java/org/simgrid/surf/surfJAVA_wrap.h
 examples/smpi/mc/smpi_bugged1
 examples/smpi/mc/smpi_bugged1_liveness
 examples/smpi/mc/smpi_bugged2
@@ -1057,7 +1058,7 @@ examples/smpi/mc/smpi_non_deterministic
 examples/smpi/mc/smpi_send_deterministic
 simgrid.jar_finalized
 simgrid_full.jar
-src/mc_page_store_unit.cpp
+src/PageStore_unit.cpp
 src/bindings/java/MANIFEST.MF
 NATIVE/
 VERSION