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

[modules/shaper.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 25d046ae1b03e0bfce5a2f82638e665e79a0218e..b3e5bb13fb16b3cafc9c15e28bdc11ef91562fb4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ lib/
 *.pro.user
 moc_*.*
 *.qm
+*.ts
 #Resources
 resources
 !src/*/resources
@@ -27,3 +28,5 @@ start.bat
 *.orig
 *~
 /.project
+*DFBrowser*
+