Merge branch 'master' of ssh://aur.archlinux.org/freecad-git

This commit is contained in:
Markus Hovorka 2017-05-19 11:56:39 +02:00
commit dc465119e6
6 changed files with 108 additions and 76 deletions

1
.gitignore vendored
View file

@ -6,5 +6,6 @@
!ChangeLog
!*.diff
!*.patch
<<<<<<< HEAD
!*.desktop
!*.xml