Merge branch 'Dev_1.2.0' of newgeom:newgeom into Dev_1.2.0

[modules/shaper.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 26f8ecedcb20b18e3d75259965a0f25a18b834e5..b3e5bb13fb16b3cafc9c15e28bdc11ef91562fb4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,9 +18,15 @@ lib/
 *.pro.user
 moc_*.*
 *.qm
+*.ts
 #Resources
 resources
 !src/*/resources
 doc/html
 *_log.txt
-start.bat
\ No newline at end of file
+start.bat
+*.orig
+*~
+/.project
+*DFBrowser*
+