Merge commit '00b160af117b782292619c98effce6c8273792e5'
authorJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 16:42:20 +0000 (13:42 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 28 Sep 2017 16:42:20 +0000 (13:42 -0300)
commit1a4d2e8b4da73d15721bce30279d16b3690bfbf2
treedc91b8aee247a782932af3ccfa68afdef1a4f24f
parent6c9f44a3c2cc0c7094178438e65d2abc0f415b07
parent00b160af117b782292619c98effce6c8273792e5
Merge commit '00b160af117b782292619c98effce6c8273792e5'

* commit '00b160af117b782292619c98effce6c8273792e5':
  nvenc: Fix nvec vs. nvenc typo

This commit is a noop.

Merged-by: James Almer <jamrial@gmail.com>