]> source.dussan.org Git - tigervnc.git/commitdiff
Merge branch 'pixeltest' of https://github.com/CendioOssman/tigervnc
authorPierre Ossman <ossman@cendio.se>
Mon, 7 Jul 2014 12:36:35 +0000 (14:36 +0200)
committerPierre Ossman <ossman@cendio.se>
Mon, 7 Jul 2014 12:36:35 +0000 (14:36 +0200)
1  2 
CMakeLists.txt
common/rfb/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
Simple merge