Merged with master

[situare] / .gitignore

diff --git a/.gitignore b/.gitignore
index 23b038f..37bdac3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ Makefile
 Situare
 *.orig
 doc/doxygen/*
+situare
+testtabs