Merge branch 'master' into new_zoom_buttons_panel

[situare] / .gitignore

diff --git a/.gitignore b/.gitignore
index 4f0f80b..b4e92d8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,10 @@ moc_*
 *.moc
 *.pro.user
 Makefile
+Situare
+*.orig
+doc/doxygen/*
+situare
+mainwindow_test
+qrc_images.cpp
+