[X2Go-Commits] [nx-libs] 10/45: Merge branch 'feature/other-Xserver-cleanup' into arctica-3.6.x

[git-admin at x2go.org]

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 bb23f7a3d8e1ebdcf59d12d2e51bcaca849818b4
Merge: 8ed8a43 d280fa1
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Apr 5 20:58:58 2015 +0200

    Merge branch 'feature/other-Xserver-cleanup' into arctica-3.6.x
    
    Attributes GH PR #8: https://github.com/ArcticaProject/nx-libs/pull/8

 debian/rules                                 |    3 -
 nx-X11/config/cf/README                      |   12 -
 nx-X11/config/cf/X11.tmpl                    |  105 +-
 nx-X11/config/cf/host.def                    |  105 +-
 nx-X11/config/cf/xf86site.def                |   30 -
 nx-X11/config/cf/xfree86.cf                  |   17 -
 nx-X11/config/cf/xorg.cf                     |   14 -
 nx-X11/config/cf/xorgsite.def                |   30 -
 nx-X11/include/extensions/Imakefile          |    6 +-
 nx-X11/include/extensions/Print.h            |  552 ------
 nx-X11/include/extensions/Printstr.h         |  783 --------
 nx-X11/include/extensions/dmxext.h           |  190 --
 nx-X11/include/extensions/dmxproto.h         |  446 -----
 nx-X11/lib/Imakefile                         |    6 +-
 nx-X11/lib/X11/Imakefile                     |    2 +-
 nx-X11/programs/Imakefile                    |  146 --
 nx-X11/programs/Xserver/Imakefile            |  590 +-----
 nx-X11/programs/Xserver/Xext/Imakefile       |   16 +-
 nx-X11/programs/Xserver/Xext/dmx.c           | 1133 -----------
 nx-X11/programs/Xserver/Xext/xprint.c        | 2760 --------------------------
 nx-X11/programs/Xserver/dix/Imakefile        |    6 +-
 nx-X11/programs/Xserver/dix/main.c           |    9 -
 nx-X11/programs/Xserver/dix/xpstubs.c        |   27 -
 nx-X11/programs/Xserver/hw/Imakefile         |   26 -
 nx-X11/programs/Xserver/hw/nxagent/Imakefile |    3 +
 nx-X11/programs/Xserver/mi/miinitext.c       |   45 -
 nx-X11/programs/Xserver/os/Imakefile         |    2 +-
 nx-X11/programs/Xserver/os/utils.c           |   13 -
 nx-libs.spec                                 |    4 -
 29 files changed, 23 insertions(+), 7058 deletions(-)

--
Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git