This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit fb2a4e4c510a80630722834f2cf408f8b731b4ef Merge: cc92f77 26091f4 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 21 10:50:31 2015 +0200 Merge branch 'sunweaver-pr/hw-driver-cleanup' into arctica-3.6.x Attributes GH PR #41: https://github.com/ArcticaProject/nx-libs/pull/41 nx-X11/config/Imakefile | 6 +- nx-X11/config/cf/Imakefile | 96 +- nx-X11/config/cf/Server.tmpl | 4 - nx-X11/config/cf/host.def | 21 - nx-X11/config/cf/linux.cf | 8 - nx-X11/config/cf/xf86.tmpl | 128 -- nx-X11/config/cf/xf86site.def | 479 -------- nx-X11/config/cf/xfree86.cf | 1770 --------------------------- nx-X11/config/cf/xorg.cf | 386 +----- nx-X11/config/cf/xorgsite.def | 21 - nx-X11/programs/Xserver/GL/mesa/X/Imakefile | 7 - nx-X11/programs/Xserver/Imakefile | 4 +- nx-X11/programs/Xserver/Xext/Imakefile | 8 +- nx-X11/programs/Xserver/include/Imakefile | 2 +- nx-X11/programs/Xserver/mi/Imakefile | 2 +- nx-X11/programs/Xserver/xkb/Imakefile | 4 +- 16 files changed, 14 insertions(+), 2932 deletions(-) -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git