Merge commit '67c65e461cb073d61ffbc78845d4a3d8f14bf481'
authorClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:07:00 +0000 (10:07 +0200)
committerClément Bœsch <cboesch@gopro.com>
Thu, 30 Mar 2017 08:07:00 +0000 (10:07 +0200)
commit4f96c11ed74342a88346fe7972c71514cc98b320
tree2acf378d49eef529a5eab2ecfeb71bdf88fdf0e6
parenta5745897e4c56785bfc8a00f70f9c81fadc29a4d
parent67c65e461cb073d61ffbc78845d4a3d8f14bf481
Merge commit '67c65e461cb073d61ffbc78845d4a3d8f14bf481'

* commit '67c65e461cb073d61ffbc78845d4a3d8f14bf481':
  vf_hwupload_cuda: Fix build error

This commit is a noop, see 78e871ebbcc6f3c877e7292c4dda0c9979f8ede4

Merged-by: Clément Bœsch <cboesch@gopro.com>