From: git <wangtsaichang@gmail.com>
Date: Sun, 2 Jul 2017 21:38:46 +0000 (+0200)
Subject: Merge branch 'CYC'
X-Git-Url: http://git.risc.jku.at/gitweb/?a=commitdiff_plain;h=79afdd0bcb9d43d2e4fb51f0a9dadc760f341363;p=ipau%2FColorBlackWhiteConversion.git

Merge branch 'CYC'
---

79afdd0bcb9d43d2e4fb51f0a9dadc760f341363