]> source.dussan.org Git - tigervnc.git/commit
Merge branch 'upreqs' of https://github.com/CendioOssman/tigervnc
authorPierre Ossman <ossman@cendio.se>
Thu, 12 Mar 2015 10:15:32 +0000 (11:15 +0100)
committerPierre Ossman <ossman@cendio.se>
Thu, 12 Mar 2015 10:15:32 +0000 (11:15 +0100)
commitd1cb31f43636e574058f64ac3e5e4cbe20f162b4
tree1260ce593ca99b9fe22eb51b906f54b2c0f567fe
parent59b4bc5638ced3cb5f043ccd9ed207fe76148d1a
parent4cf2d3a621ecb9918b57021bc1cee1bd016dc0aa
Merge branch 'upreqs' of https://github.com/CendioOssman/tigervnc

Conflicts:
contrib/packages/rpm/el5/SPECS/tigervnc.spec
vncviewer/Viewport.cxx
14 files changed:
CMakeLists.txt
cmake/StaticBuild.cmake
common/rdr/TLSInStream.cxx
contrib/packages/rpm/el5/SPECS/tigervnc.spec
unix/xserver/hw/vnc/Input.c
unix/xserver/hw/vnc/InputXKB.c
unix/xserver/hw/vnc/Makefile.am
unix/xserver/hw/vnc/xorg-version.h
unix/xserver/hw/vnc/xvnc.c
vncviewer/OptionsDialog.cxx
vncviewer/Viewport.cxx
vncviewer/cocoa.mm
vncviewer/parameters.cxx
vncviewer/vncviewer.cxx