Merge remote-tracking branch 'upstream/dev' into dev

This commit is contained in:
2Shirt 2019-02-05 23:03:47 -07:00
commit 23ffcae432
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C

View file

@ -4,8 +4,10 @@ base-devel
curl curl
dos2unix dos2unix
git git
gtk-doc
hwloc hwloc
imlib2 imlib2
json-glib
lhasa lhasa
libbsd libbsd
libewf libewf