From: Pierre Ossman <ossman@cendio.se>
Date: Tue, 27 Oct 2015 13:08:32 +0000 (+0100)
Subject: Merge branch 'jpeg_includes' of https://github.com/dcommander/tigervnc
X-Git-Tag: v1.5.90~10
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=643f16527514b5e2a012261e0204dbd856677f27;p=tigervnc.git

Merge branch 'jpeg_includes' of https://github.com/dcommander/tigervnc
---

643f16527514b5e2a012261e0204dbd856677f27