Soft'N'Design Software
/
projects
/
debian6500.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DCR860 : corrects interface hrgonio evolution impacts new release 0.10.0
[debian6500.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index 5b16382834d10bfe74365446cde3f127f082cb6a..87a360b8f81bc16a7c6d47e0976a96e2969866a1 100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-5,6
+5,8
@@
prod_rhp*
*~
*.contrib*
*.keep
*~
*.contrib*
*.keep
+*.orig
+*.merge
*.pyc
*.o
*.os
*.pyc
*.o
*.os