From: git <wangtsaichang@gmail.com>
Date: Thu, 29 Jun 2017 10:19:18 +0000 (+0200)
Subject: Merge branch 'CYC'
X-Git-Url: http://git.risc.jku.at/gitweb/?a=commitdiff_plain;h=660d4758f923f0f522a3a5237be8281ff72187a7;p=ipau%2FColorBlackWhiteConversion.git

Merge branch 'CYC'
---

660d4758f923f0f522a3a5237be8281ff72187a7