From: git <wangtsaichang@gmail.com>
Date: Wed, 28 Jun 2017 23:46:23 +0000 (+0200)
Subject: Merge branch 'CYC'
X-Git-Url: http://git.risc.jku.at/gitweb/?a=commitdiff_plain;h=52f10f4e38fe649702ed73d85f6ee564b7f618e3;p=ipau%2FColorBlackWhiteConversion.git

Merge branch 'CYC'
---

52f10f4e38fe649702ed73d85f6ee564b7f618e3