Merge branch 'master' of newgeom:newgeom.git

[modules/shaper.git] / .gitignore

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