]> source.dussan.org Git - tigervnc.git/commitdiff
Merge branch 'nocolourmap' of https://github.com/CendioOssman/tigervnc
authorPierre Ossman <ossman@cendio.se>
Mon, 14 Jul 2014 14:15:16 +0000 (16:15 +0200)
committerPierre Ossman <ossman@cendio.se>
Mon, 14 Jul 2014 14:15:16 +0000 (16:15 +0200)
1  2 
unix/xserver/hw/vnc/XserverDesktop.cc
unix/xserver/hw/vnc/XserverDesktop.h

Simple merge
Simple merge