From: Pyry Haulos <phaulos@google.com>
Date: Mon, 11 Jan 2016 19:34:43 +0000 (+0000)
Subject: am 71438518: Merge "Allow alternative mix() implementation" into mnc-dev
X-Git-Tag: upstream/0.1.0~1259^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0a304e1619aaf2d5dd84aee380fc167790697c1;p=platform%2Fupstream%2FVK-GL-CTS.git

am 71438518: Merge "Allow alternative mix() implementation" into mnc-dev
am: 6d52c15d4b

* commit '6d52c15d4b4243778f8fe46514eb4693f507963a':
---

b0a304e1619aaf2d5dd84aee380fc167790697c1