Merge branch 'thrust_allocator' of https://github.com/dtmoodie/opencv
authorDan <dtmoodie@gmail.com>
Thu, 18 Feb 2016 05:43:18 +0000 (00:43 -0500)
committerDan <dtmoodie@gmail.com>
Thu, 18 Feb 2016 05:43:18 +0000 (00:43 -0500)
commitc0e34934c8900e10e2c220ce1c62dbad0acddb37
tree65b31bff2be381a195d2ef1d353ca5ef1c2670c9
parent06ea7094f557432f56896e0c8d7a36d3dfe14fe3
parentda93a5527dff49c36100b750f340193319c22689
Merge branch 'thrust_allocator' of https://github.com/dtmoodie/opencv