Merged with ui. Added .orig files to .gitignore.

[situare] / .gitignore

diff --git a/.gitignore b/.gitignore
index 4f0f80b..e588ff6 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,5 @@ moc_*
 *.moc
 *.pro.user
 Makefile
+Situare
+*.orig