summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2015-05-04 14:32:25 +0200
committerPierre Ossman <ossman@cendio.se>2015-05-04 14:32:25 +0200
commit8ccc32337af1aabb7e1793499d6fd2ddf8d6ae84 (patch)
tree012d6632cfd29bb1006594577001c070495e0df6 /unix
parentbc845d92c1c9f4d14b235245cf86b83ed5f0f0fb (diff)
parentb02996ac125f754bf5e0f32d4ca0d5747e4fb986 (diff)
parent9d93fb4c5454b92a8fd031906dc9a13535393b8b (diff)
downloadtigervnc-8ccc32337af1aabb7e1793499d6fd2ddf8d6ae84.tar.gz
tigervnc-8ccc32337af1aabb7e1793499d6fd2ddf8d6ae84.zip
Merge branches 'noreset' and 'syslog' of https://github.com/michalsrb/tigervnc