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 51b60ea7a1eaf1983c6a0d8095bf187a5f100f8b Merge: 5a64974 5cd80d2 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Jun 16 23:58:50 2015 +0200 Merge branch 'sunweaver-pr/libglx-cleanup' into arctica-3.6.x Attributes GH PR #40: https://github.com/ArcticaProject/nx-libs/pull/40 nx-X11/config/cf/X11.tmpl | 69 --- nx-X11/config/cf/host.def | 5 - nx-X11/config/cf/linux.cf | 64 --- nx-X11/config/cf/lnxLib.tmpl | 7 +- nx-X11/config/cf/xfree86.cf | 253 +--------- nx-X11/config/cf/xorg.cf | 253 +--------- nx-X11/config/cf/xorgsite.def | 5 - nx-X11/include/Imakefile | 2 +- nx-X11/lib/GL/GL/GL-def.cpp | 493 -------------------- nx-X11/lib/GL/GL/Imakefile | 244 ---------- nx-X11/lib/GL/Imakefile | 133 ------ nx-X11/lib/GL/glx/Imakefile | 233 --------- nx-X11/lib/GL/mesa/Imakefile | 84 ---- nx-X11/lib/GL/mesa/array_cache/Imakefile | 91 ---- nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile | 44 -- .../lib/GL/mesa/drivers/dri/common/Imakefile.inc | 105 ----- nx-X11/lib/GL/mesa/drivers/osmesa/Imakefile | 111 ----- nx-X11/lib/GL/mesa/drivers/x11/Imakefile | 70 --- nx-X11/lib/GL/mesa/main/Imakefile | 66 --- nx-X11/lib/GL/mesa/math/Imakefile | 98 ---- nx-X11/lib/GL/mesa/shader/Imakefile | 107 ----- nx-X11/lib/GL/mesa/shader/grammar/Imakefile | 98 ---- nx-X11/lib/GL/mesa/shader/slang/Imakefile | 108 ----- nx-X11/lib/GL/mesa/shader/slang/library/Imakefile | 97 ---- nx-X11/lib/GL/mesa/sparc/Imakefile | 68 --- nx-X11/lib/GL/mesa/sparc/Imakefile.inc | 58 --- nx-X11/lib/GL/mesa/swrast/Imakefile | 100 ---- nx-X11/lib/GL/mesa/swrast_setup/Imakefile | 99 ---- nx-X11/lib/GL/mesa/tnl/Imakefile | 101 ---- nx-X11/lib/GL/mesa/tnl_dd/Imakefile | 63 --- nx-X11/lib/GL/mesa/tnl_dd/Imakefile.inc | 40 -- nx-X11/lib/GL/mesa/x86/Imakefile | 108 ----- nx-X11/lib/GL/mesa/x86/Imakefile.inc | 217 --------- nx-X11/lib/Imakefile | 5 - nx-X11/lib/X11/Imakefile | 2 +- nx-X11/programs/Xserver/GL/Imakefile | 19 +- nx-X11/programs/Xserver/GL/glx/module/Imakefile | 4 - nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile | 30 +- .../Xserver/GL/mesa/GLcore/module/Imakefile | 53 --- nx-X11/programs/Xserver/GL/mesa/Imakefile | 13 +- .../Xserver}/GL/mesa/Imakefile.inc | 4 - nx-X11/programs/Xserver/GL/mesa/X/Imakefile | 12 +- .../Xserver/GL/mesa/X}/Imakefile.inc | 4 - nx-X11/programs/Xserver/GL/mesa/X/module/Imakefile | 6 - .../programs/Xserver/GL/mesa/array_cache/Imakefile | 12 +- .../Xserver}/GL/mesa/array_cache/Imakefile.inc | 4 - .../Xserver/GL/mesa/array_cache/module/Imakefile | 6 - nx-X11/programs/Xserver/GL/mesa/main/Imakefile | 12 +- .../Xserver}/GL/mesa/main/Imakefile.inc | 4 - .../programs/Xserver/GL/mesa/main/module/Imakefile | 6 - nx-X11/programs/Xserver/GL/mesa/math/Imakefile | 12 +- .../Xserver}/GL/mesa/math/Imakefile.inc | 4 - .../programs/Xserver/GL/mesa/math/module/Imakefile | 6 - nx-X11/programs/Xserver/GL/mesa/shader/Imakefile | 14 +- .../Xserver}/GL/mesa/shader/Imakefile.inc | 4 - .../Xserver/GL/mesa/shader/grammar/Imakefile | 12 +- .../Xserver}/GL/mesa/shader/grammar/Imakefile.inc | 4 - .../Xserver/GL/mesa/shader/slang/Imakefile | 14 +- .../Xserver}/GL/mesa/shader/slang/Imakefile.inc | 4 - .../Xserver/GL/mesa/shader/slang/library/Imakefile | 11 +- .../GL/mesa/shader/slang/library/Imakefile.inc | 0 nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile | 13 +- .../Xserver}/GL/mesa/swrast/Imakefile.inc | 4 - .../Xserver/GL/mesa/swrast/module/Imakefile | 6 - .../Xserver/GL/mesa/swrast_setup/Imakefile | 13 +- .../Xserver}/GL/mesa/swrast_setup/Imakefile.inc | 4 - .../Xserver/GL/mesa/swrast_setup/module/Imakefile | 6 - nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile | 12 +- .../Xserver}/GL/mesa/tnl/Imakefile.inc | 4 - .../programs/Xserver/GL/mesa/tnl/module/Imakefile | 6 - nx-X11/programs/Xserver/GL/opengl/Imakefile | 140 ------ nx-X11/programs/Xserver/Imakefile | 44 +- 72 files changed, 59 insertions(+), 4168 deletions(-) -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git