diff src/gpu/hsail/vm/gpu_hsail.cpp @ 16914:826c172a048f

SL: fixed merge problem.
author Christian Humer <christian.humer@gmail.com>
date Sat, 23 Aug 2014 19:31:36 +0200
parents bbb987aec58d
children 2d6dd2eebd51
line wrap: on
line diff