[X2Go-Commits] [nx-libs] 04/20: Merge branch 'sunweaver-pr/imake-cleanup-nonpresent-buildlogic' into arctica-3.6.x
git-admin at x2go.org
git-admin at x2go.org
Fri May 15 14:07:10 CEST 2015
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 7b7ba9441b3ff72f0e963221342dcccbafc04312
Merge: cbf4e4d 662a895
Author: Mihai Moldovan <ionic at ionic.de>
Date: Tue Apr 28 05:15:19 2015 +0200
Merge branch 'sunweaver-pr/imake-cleanup-nonpresent-buildlogic' into arctica-3.6.x
Attributes GH PR #17: https://github.com/ArcticaProject/nx-libs/pull/17
doc/nx-X11_vs_XOrg69_patches/host.def.NX.patch | 2 +-
nx-X11/config/Imakefile | 8 +-
nx-X11/config/cf/Imake.tmpl | 15 -
nx-X11/config/cf/README | 83 --
nx-X11/config/cf/X11.tmpl | 1254 +----------------------
nx-X11/config/cf/host.def | 125 +--
nx-X11/config/cf/linux.cf | 30 -
nx-X11/config/cf/lnxLib.rules | 72 --
nx-X11/config/cf/lnxLib.tmpl | 55 -
nx-X11/config/cf/site.def | 19 -
nx-X11/config/cf/xf86site.def | 75 +-
nx-X11/config/cf/xfree86.cf | 62 --
nx-X11/config/cf/xorg.cf | 62 --
nx-X11/config/cf/xorgsite.def | 113 +-
nx-X11/include/Imakefile | 15 +-
nx-X11/include/extensions/Imakefile | 45 +-
nx-X11/lib/GL/GL/Imakefile | 2 -
nx-X11/lib/GL/Imakefile | 20 +-
nx-X11/lib/GL/mesa/Imakefile | 15 +-
nx-X11/lib/GL/mesa/drivers/dri/common/Imakefile | 2 +-
nx-X11/lib/Imakefile | 140 +--
nx-X11/programs/Xserver/Imakefile | 21 +-
nx-X11/programs/Xserver/os/Imakefile | 17 +-
nx-X11/programs/Xserver/os/lbxio.c | 555 ----------
24 files changed, 122 insertions(+), 2685 deletions(-)
--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list