summaryrefslogtreecommitdiffstats
path: root/test/bmp.h
diff options
context:
space:
mode:
authorChristian Beier <dontmind@freeshell.org>2017-03-26 14:32:46 +0200
committerChristian Beier <dontmind@freeshell.org>2017-03-26 14:32:46 +0200
commite03b5750f84ce9816d5c6055ba3da34755aff934 (patch)
tree44e23decd21c5caf5fb09f6c286b8e980ee120e5 /test/bmp.h
parent0d0a2fc2b5567365b142a77fa961b0c9658b6010 (diff)
parenta01a18df1d44ec875708d5fc9d6c4e0934535974 (diff)
downloadlibtdevnc-e03b5750f84ce9816d5c6055ba3da34755aff934.tar.gz
libtdevnc-e03b5750f84ce9816d5c6055ba3da34755aff934.zip
Merge branch 'circle' of https://github.com/ldmnyblzs/libvncserver into ldmnyblzs-circle
Conflicts: libvncclient/rfbproto.c
Diffstat (limited to 'test/bmp.h')
0 files changed, 0 insertions, 0 deletions