]> source.dussan.org Git - tigervnc.git/commitdiff
Merge branch 'exittimer' of https://github.com/CendioOssman/tigervnc
authorPierre Ossman <ossman@cendio.se>
Fri, 9 Nov 2018 16:28:44 +0000 (17:28 +0100)
committerPierre Ossman <ossman@cendio.se>
Fri, 9 Nov 2018 16:28:44 +0000 (17:28 +0100)
1  2 
unix/x0vncserver/XDesktop.cxx
unix/x0vncserver/x0vncserver.cxx

Simple merge
Simple merge