Merge branch 'master' into memleak-finder

[lttng-tools.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 12c243d445e67c3d3512509b19ce61a9d52b05ee..5d1e2ffa03204d652d980477e1eca9b4da55b274 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,7 @@ Makefile.in
 *.info
 *.bz2
 *.tar
+.dirstamp
 configure
 aclocal.m4
 autom4te.cache/
@@ -49,6 +50,8 @@ extras/core-handler/crash
 
 .checkpatch.conf
 
+!memleak/Makefile
+
 # Tests
 tests/unit/test_kernel_data
 tests/unit/test_session