[X2Go-Commits] [nx-libs] 19/45: Merge branch 'sunweaver-pr/nxupgradeagent-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 cfc0202b42ad307391202ca776937b28ea7d2b03
Merge: fad840c a5f71f0
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Apr 16 18:03:18 2015 +0200

    Merge branch 'sunweaver-pr/nxupgradeagent-cleanup' into arctica-3.6.x

 nx-X11/config/cf/host.def                          |    7 -
 nx-X11/programs/Xserver/hw/nxagent/Composite.c     |   10 -
 nx-X11/programs/Xserver/hw/nxagent/Imakefile       |    8 +-
 nx-X11/programs/Xserver/hw/nxagent/Init.c          |    8 -
 nx-X11/programs/Xserver/hw/nxagent/NXcomposite.c   |  359 --
 nx-X11/programs/Xserver/hw/nxagent/NXcomposite.h   |    4 -
 .../programs/Xserver/hw/nxagent/NXcompositeext.h   |    4 -
 .../programs/Xserver/hw/nxagent/NXcompositeint.h   |   76 -
 .../programs/Xserver/hw/nxagent/NXcompositeproto.h |  148 -
 nx-X11/programs/Xserver/hw/nxagent/NXdamage.c      | 2072 +++++++-
 nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c    |  541 +--
 nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c    |  276 +-
 nx-X11/programs/Xserver/hw/nxagent/NXevents.c      | 1049 ++--
 nx-X11/programs/Xserver/hw/nxagent/NXextension.c   |   54 +-
 nx-X11/programs/Xserver/hw/nxagent/NXglxext.c      |   63 +-
 nx-X11/programs/Xserver/hw/nxagent/NXglyph.c       |   94 +-
 nx-X11/programs/Xserver/hw/nxagent/NXglyphcurs.c   |   25 +-
 nx-X11/programs/Xserver/hw/nxagent/NXglyphstr.h    |   35 +-
 nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c    |   71 +-
 nx-X11/programs/Xserver/hw/nxagent/NXmiglyph.c     |   16 +-
 nx-X11/programs/Xserver/hw/nxagent/NXmitrap.c      |  129 +-
 nx-X11/programs/Xserver/hw/nxagent/NXmiwindow.c    |   49 +-
 nx-X11/programs/Xserver/hw/nxagent/NXpicture.c     |  944 +++-
 nx-X11/programs/Xserver/hw/nxagent/NXpicturestr.h  |  206 +-
 nx-X11/programs/Xserver/hw/nxagent/NXproperty.c    |  157 +-
 nx-X11/programs/Xserver/hw/nxagent/NXrender.c      |  909 +++-
 nx-X11/programs/Xserver/hw/nxagent/NXresource.c    |  319 +-
 nx-X11/programs/Xserver/hw/nxagent/NXshm.c         |  161 +-
 nx-X11/programs/Xserver/hw/nxagent/NXwindow.c      |  566 ++-
 nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c      |   94 +-
 nx-X11/programs/Xserver/hw/nxagent/Render.c        |   60 -
 nx-X11/programs/Xserver/hw/nxagent/X/NXdamage.c    | 2073 --------
 nx-X11/programs/Xserver/hw/nxagent/X/NXdispatch.c  | 4682 ------------------
 nx-X11/programs/Xserver/hw/nxagent/X/NXdixfonts.c  | 2805 -----------
 nx-X11/programs/Xserver/hw/nxagent/X/NXevents.c    | 5044 --------------------
 nx-X11/programs/Xserver/hw/nxagent/X/NXextension.c |  508 --
 nx-X11/programs/Xserver/hw/nxagent/X/NXglxext.c    |  575 ---
 nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c     |  581 ---
 nx-X11/programs/Xserver/hw/nxagent/X/NXglyphcurs.c |  241 -
 nx-X11/programs/Xserver/hw/nxagent/X/NXglyphstr.h  |  174 -
 nx-X11/programs/Xserver/hw/nxagent/X/NXmiexpose.c  |  979 ----
 nx-X11/programs/Xserver/hw/nxagent/X/NXmiglyph.c   |  318 --
 nx-X11/programs/Xserver/hw/nxagent/X/NXmitrap.c    |  233 -
 nx-X11/programs/Xserver/hw/nxagent/X/NXmiwindow.c  | 1222 -----
 nx-X11/programs/Xserver/hw/nxagent/X/NXpicture.c   | 2274 ---------
 .../programs/Xserver/hw/nxagent/X/NXpicturestr.h   |  679 ---
 nx-X11/programs/Xserver/hw/nxagent/X/NXproperty.c  |  992 ----
 nx-X11/programs/Xserver/hw/nxagent/X/NXrender.c    | 3861 ---------------
 nx-X11/programs/Xserver/hw/nxagent/X/NXresource.c  | 1250 -----
 nx-X11/programs/Xserver/hw/nxagent/X/NXshm.c       | 1498 ------
 nx-X11/programs/Xserver/hw/nxagent/X/NXwindow.c    | 4167 ----------------
 nx-X11/programs/Xserver/hw/nxagent/X/NXxvdisp.c    | 2292 ---------
 52 files changed, 6098 insertions(+), 38864 deletions(-)

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