Merged with master

[situare] / .gitignore

diff --git a/.gitignore b/.gitignore
index 73ae3af..37bdac3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,8 @@ moc_*
 *.moc
 *.pro.user
 Makefile
+Situare
+*.orig
+doc/doxygen/*
 situare
-testtabs
\ No newline at end of file
+testtabs