[X2Go-Commits] [nx-libs] 18/40: Merge branch 'sunweaver-pr/libxrandr-cleanup' into arctica-3.6.x

git-admin at x2go.org git-admin at x2go.org
Sat Jun 20 00:03:24 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 230852e0e77985e1d62593fe393059dc0053c043
Merge: 608ee99 a6185ab
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon May 25 23:23:22 2015 +0200

    Merge branch 'sunweaver-pr/libxrandr-cleanup' into arctica-3.6.x
    
    Attributes GH PR #21: https://github.com/ArcticaProject/nx-libs/pull/21

 debian/control                                   |   57 +-
 debian/libnx-xrandr-dev.install.in               |    2 -
 debian/libnx-xrandr2.install.in                  |    1 -
 debian/libnx-xrandr2.symbols                     |   23 -
 debian/nx-x11proto-randr-dev.install.in          |    2 -
 debian/rules                                     |    1 -
 nx-X11/config/cf/X11.tmpl                        |   37 --
 nx-X11/config/cf/host.def                        |    2 -
 nx-X11/config/cf/lnxLib.tmpl                     |    1 -
 nx-X11/include/extensions/Imakefile              |    4 -
 nx-X11/include/extensions/randr.h                |   74 ---
 nx-X11/include/extensions/randrproto.h           |  209 ------
 nx-X11/lib/Imakefile                             |    5 -
 nx-X11/lib/Xrandr/Imakefile                      |   42 --
 nx-X11/lib/Xrandr/Xrandr-def.cpp                 |   36 --
 nx-X11/lib/Xrandr/Xrandr.c                       |  744 ---------------------
 nx-X11/lib/Xrandr/Xrandr.h                       |  151 -----
 nx-X11/lib/Xrandr/Xrandr.man                     |  351 ----------
 nx-X11/lib/Xrandr/Xrandrint.h                    |   87 ---
 nx-X11/lib/Xrandr/test.c                         |   21 -
 nx-X11/programs/Xserver/Imakefile                |    4 +-
 nx-X11/programs/Xserver/hw/nxagent/Events.c      |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/Imakefile     |    9 +-
 nx-X11/programs/Xserver/hw/nxagent/NXxrandr.c    |  755 ----------------------
 nx-X11/programs/Xserver/hw/nxagent/NXxrandr.h    |  168 -----
 nx-X11/programs/Xserver/hw/nxagent/NXxrandrint.h |  104 ---
 nx-X11/programs/Xserver/hw/nxagent/Screen.c      |    2 +-
 nx-libs.spec                                     |   29 +-
 nxcompshad/Makefile.in                           |    2 +-
 29 files changed, 32 insertions(+), 2893 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