Sync with master branch.

[ardour-manual-diverged] / .gitignore

diff --git a/.gitignore b/.gitignore
index 5df50814e32df871011f8bcc79fa6f8901eedb9f..d7fa985bb50e4aa903a197379a7538d2fa33640c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 _site
 drupal-export.html
 tmp
+*~
+#*#