Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 26f8ecedcb20b18e3d75259965a0f25a18b834e5..f55ecf287870a46e890ed9032633c95acc3311ab 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-18,9
+18,13
@@
lib/
*.pro.user
moc_*.*
*.qm
*.pro.user
moc_*.*
*.qm
+*.ts
#Resources
resources
!src/*/resources
doc/html
*_log.txt
#Resources
resources
!src/*/resources
doc/html
*_log.txt
-start.bat
\ No newline at end of file
+start.bat
+*.orig
+*~
+/.project