Merge branch 'master' of ssh://aur.archlinux.org/freecad-git
This commit is contained in:
commit
dc465119e6
6 changed files with 108 additions and 76 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -6,5 +6,6 @@
|
|||
!ChangeLog
|
||||
!*.diff
|
||||
!*.patch
|
||||
<<<<<<< HEAD
|
||||
!*.desktop
|
||||
!*.xml
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue