Merge branch 'master' into benchmark

[lttng-tools.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ac0b2f43346cb6219c2d521ee80f1471299892e7..969e75ba5797c88b6da2cb1141c96d687b395fbe 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -45,5 +45,6 @@ ust_global_all_events_basic
 ust_global_event_basic
 gen-nevents
 gen-events-time
+gen-events
 
-benchmark/
+benchmark/bench_sessions