Merged with master

[situare] / .gitignore

diff --git a/.gitignore b/.gitignore
index e588ff6..37bdac3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,6 @@ moc_*
 Makefile
 Situare
 *.orig
+doc/doxygen/*
+situare
+testtabs