Merge back master branch

[simgrid.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index c6bdbe9..ee6cc13 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@
 *.mk\r
 *.swp\r
 *.patch\r
+*.plist\r
+*.trace\r
 \r
 ################################################\r
 ### Libraries links \r
@@ -186,6 +188,7 @@ examples/msg/mc/bugged2
 examples/msg/mc/bugged1\r
 examples/msg/parallel_contexts/pcontexts\r
 examples/msg/parallel_contexts/pcontexts2\r
+examples/msg/pmm/msg_pmm\r
 examples/simdag/ex_sd_test\r
 examples/simdag/ex_sd_test2\r
 examples/simdag/metaxml/sd_meta\r