diff options
| author | Juergen Daubert <jue@jue.li> | 2014-06-14 18:29:57 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2014-06-14 18:29:57 +0200 |
| commit | 1a9a474bf52ff44f952ba770e986b7aaba80d763 (patch) | |
| tree | 8d4b665a79fc45fad86215caf6cfe638f753ae82 | |
| parent | de931585947b2a4dc2f836e06cabb74c0ef01846 (diff) | |
| parent | df4ad1223d384e7f17fc0959359ef75f3ace227b (diff) | |
| download | core-1a9a474bf52ff44f952ba770e986b7aaba80d763.tar.gz core-1a9a474bf52ff44f952ba770e986b7aaba80d763.tar.xz | |
Merge branch '3.0' into 3.1
Conflicts:
gcc/.footprint
gcc/.md5sum
gcc/Pkgfile
| -rw-r--r-- | libusb/.md5sum | 2 | ||||
| -rw-r--r-- | libusb/Pkgfile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libusb/.md5sum b/libusb/.md5sum index 98c81012..8d6f2987 100644 --- a/libusb/.md5sum +++ b/libusb/.md5sum @@ -1 +1 @@ -4a6d049923efc6496f1d383054dac1a6 libusb-1.0.18.tar.bz2 +f9e2bb5879968467e5ca756cb4e1fa7e libusb-1.0.19.tar.bz2 diff --git a/libusb/Pkgfile b/libusb/Pkgfile index 6f570159..63c8c141 100644 --- a/libusb/Pkgfile +++ b/libusb/Pkgfile @@ -4,7 +4,7 @@ # Depends on: eudev name=libusb -version=1.0.18 +version=1.0.19 release=1 source=(http://downloads.sourceforge.net/project/$name/$name-1.0/$name-${version%-*}/$name-$version.tar.bz2) |