Merge branch '3.1' into 3.2

Conflicts:
	xorg-xf86-input-synaptics/Pkgfile
This commit is contained in:
Juergen Daubert 2015-11-02 11:03:40 +01:00
commit fa5c0fe243
2 changed files with 3 additions and 3 deletions

View File

@ -1 +1 @@
8ed68e8cc674dd61adb280704764aafb xf86-input-synaptics-1.8.2.tar.bz2
4e3c8bed1ab4a67db2160c2c3d7e2a34 xf86-input-synaptics-1.8.3.tar.bz2

View File

@ -4,8 +4,8 @@
# Depends on: xorg-server xorg-libevdev
name=xorg-xf86-input-synaptics
version=1.8.2
release=2
version=1.8.3
release=1
source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-$version.tar.bz2)
build() {