[X2Go-Commits] [nx-libs] 18/18: Merge branch 'bugfix/xinerama-crtcs' into 3.6.x-rpm-debug

git-admin at x2go.org git-admin at x2go.org
Fri Jul 13 07:30:57 CEST 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x-rpm-debug
in repository nx-libs.

commit d9ce6b2fd5fc26be1aaa9deab0be8d7bb06c04f9
Merge: 9a8f8f8 83f69b1
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Jul 13 07:28:05 2018 +0200

    Merge branch 'bugfix/xinerama-crtcs' into 3.6.x-rpm-debug

 .travis.yml                                        |   74 +-
 Makefile                                           |   10 +-
 debian/nxagent.install                             |    1 -
 debian/nxagent.postinst                            |    3 +
 debian/nxagent.postrm                              |    3 +
 debian/nxagent.preinst                             |    3 +
 debian/rules                                       |   10 +-
 doc/libNX_X11/lcUniConv/8bit_tab_to_h.c            |    8 +
 etc/nxagent.keyboard                               |    1 -
 m4/nx-macros.m4                                    |    8 +-
 nx-X11/Makefile                                    |    2 +-
 nx-X11/config/cf/Imake.rules                       |    4 +-
 nx-X11/config/cf/Imake.tmpl                        |    2 +-
 nx-X11/config/cf/gnu.cf                            |    2 +-
 nx-X11/config/cf/host.def                          |    2 +-
 nx-X11/config/cf/linux.cf                          |    2 +-
 nx-X11/config/cf/xorg.cf                           |    2 +-
 nx-X11/config/cf/xorgsite.def                      |    2 +-
 nx-X11/include/extensions/XKB.h                    |    2 +-
 nx-X11/lib/include/xtrans/Xtrans.c                 |    8 +-
 nx-X11/lib/include/xtrans/Xtranssock.c             |    4 +-
 nx-X11/programs/Xserver/Xext/dpms.c                |   17 +-
 nx-X11/programs/Xserver/Xext/sync.c                |  159 +++
 nx-X11/programs/Xserver/Xi/exevents.c              |    4 +-
 nx-X11/programs/Xserver/dix/cursor.c               |    1 +
 nx-X11/programs/Xserver/dix/devices.c              |   27 +-
 nx-X11/programs/Xserver/dix/dixfonts.c             |   16 +-
 nx-X11/programs/Xserver/dix/window.c               |    2 -
 nx-X11/programs/Xserver/hw/nxagent/Atoms.c         |   41 +-
 nx-X11/programs/Xserver/hw/nxagent/Clipboard.c     |    3 +-
 nx-X11/programs/Xserver/hw/nxagent/Display.c       |    6 +-
 nx-X11/programs/Xserver/hw/nxagent/Drawable.c      |   10 +-
 nx-X11/programs/Xserver/hw/nxagent/Error.c         |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/Events.c        |  102 +-
 nx-X11/programs/Xserver/hw/nxagent/Events.h        |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/Extensions.c    |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/Font.c          |    6 +-
 nx-X11/programs/Xserver/hw/nxagent/Handlers.c      |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/Image.c         |    8 +-
 nx-X11/programs/Xserver/hw/nxagent/Image.h         |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/Imakefile       |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/Keyboard.c      |  123 +-
 nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c    |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/NXdixfonts.c    |   33 +-
 nx-X11/programs/Xserver/hw/nxagent/NXevents.c      |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/NXmiexpose.c    |    9 +-
 nx-X11/programs/Xserver/hw/nxagent/NXrender.c      |    3 +
 nx-X11/programs/Xserver/hw/nxagent/NXresource.c    |    4 +-
 nx-X11/programs/Xserver/hw/nxagent/NXwindow.c      |    4 +-
 nx-X11/programs/Xserver/hw/nxagent/Options.h       |    4 +-
 nx-X11/programs/Xserver/hw/nxagent/Pixels.h        |    7 +-
 nx-X11/programs/Xserver/hw/nxagent/Pixmap.c        |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/Reconnect.c     |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/Screen.c        |  275 ++--
 nx-X11/programs/Xserver/hw/nxagent/Screen.h        |    8 +-
 nx-X11/programs/Xserver/hw/nxagent/Visual.c        |    4 +-
 nx-X11/programs/Xserver/hw/nxagent/Window.c        |   19 +-
 .../programs/Xserver/hw/nxagent/compext/Compext.c  |    2 +-
 .../programs/Xserver/hw/nxagent/compext/Compext.h  |    4 +-
 nx-X11/programs/Xserver/hw/nxagent/compext/Png.c   |   15 +-
 nx-X11/programs/Xserver/hw/nxagent/compext/Z.c     |    2 +-
 nx-X11/programs/Xserver/hw/nxagent/man/nxagent.1   |    2 +-
 nx-X11/programs/Xserver/include/xkbsrv.h           |   86 --
 nx-X11/programs/Xserver/mi/miexpose.c              |    8 +-
 nx-X11/programs/Xserver/mi/mizerline.c             |    7 +-
 nx-X11/programs/Xserver/os/io.c                    |    7 +-
 nx-X11/programs/Xserver/render/render.c            |   24 +-
 nx-X11/programs/Xserver/xkb/Imakefile              |    4 +-
 nx-X11/programs/Xserver/xkb/XKBAlloc.c             |  155 +--
 nx-X11/programs/Xserver/xkb/XKBMAlloc.c            |   77 +-
 nx-X11/programs/Xserver/xkb/XKBMisc.c              |  181 +--
 nx-X11/programs/Xserver/xkb/ddxLEDs.c              |    2 +-
 nx-X11/programs/Xserver/xkb/ddxLoad.c              |    6 +-
 nx-X11/programs/Xserver/xkb/xkb.c                  |  106 +-
 nx-X11/programs/Xserver/xkb/xkb.h                  |   39 -
 nx-X11/programs/Xserver/xkb/xkbAccessX.c           |    6 +-
 nx-X11/programs/Xserver/xkb/xkbActions.c           |    6 +-
 nx-X11/programs/Xserver/xkb/xkbDflts.h             |   37 -
 nx-X11/programs/Xserver/xkb/xkbEvents.c            |   44 +-
 nx-X11/programs/Xserver/xkb/xkbInit.c              |   71 +-
 nx-X11/programs/Xserver/xkb/xkbLEDs.c              |  446 +++----
 nx-X11/programs/Xserver/xkb/xkbUtils.c             |   73 --
 nx-X11/programs/Xserver/xkb/xkbconfig.c            | 1341 --------------------
 nx-X11/programs/Xserver/xkb/xkberrs.c              |   31 -
 nx-X11/programs/Xserver/xkb/xkmread.c              |   12 -
 nx-libs.spec                                       |    3 +-
 nxcomp/src/Agent.h                                 |    2 +-
 nxcomp/src/Children.cpp                            |    3 +-
 nxcomp/src/ClientChannel.cpp                       |    4 +-
 nxcomp/src/Control.cpp                             |    2 +-
 nxcomp/src/DecodeBuffer.cpp                        |    2 +-
 nxcomp/src/GenericReadBuffer.cpp                   |    2 +-
 nxcomp/src/Keeper.cpp                              |    2 +-
 nxcomp/src/Loop.cpp                                |    8 +-
 nxcomp/src/MD5.c                                   |    2 +-
 nxcomp/src/Proxy.h                                 |    2 +-
 nxcomp/src/PutPackedImage.h                        |    2 +-
 nxcomp/src/Statistics.cpp                          |    6 +-
 nxcompshad/src/Core.cpp                            |    2 +-
 nxcompshad/src/Manager.cpp                         |    2 +-
 nxcompshad/src/X11.cpp                             |    4 +-
 nxproxy/src/Main.c                                 |    2 +-
 run-static-analysis.sh                             |   14 +
 103 files changed, 927 insertions(+), 2999 deletions(-)


--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list