Merge commit '58407b4d74c99e30dbd40fe468c69dbd25ea4255'
authorJames Almer <jamrial@gmail.com>
Wed, 11 Oct 2017 21:32:30 +0000 (18:32 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 11 Oct 2017 21:32:30 +0000 (18:32 -0300)
commit9244524177b568d0da8f26cb88ab338b2ca6e475
tree0ec563538452a051d17f3fbc97bbcb4464863535
parent6dfcbd80ad446ff163b47f2bf432bbf706436ea8
parent58407b4d74c99e30dbd40fe468c69dbd25ea4255
Merge commit '58407b4d74c99e30dbd40fe468c69dbd25ea4255'

* commit '58407b4d74c99e30dbd40fe468c69dbd25ea4255':
  configure: Fix typo in objcc default setting
  x86: hevc: Add missing colons after assembly labels

This commit is a noop.

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