Merge commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9'
authorJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:20:29 +0000 (18:20 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 23 Mar 2017 21:20:29 +0000 (18:20 -0300)
commit78c52e2721cad97f4ac4a4a38c09e1cee2a4e7e2
treec020fa7aa60dbbdca0ebff119f41ac483e49dd3a
parent09a80419b73d804d7071194789976b7024ec888f
parentd32571626a2c36c026b7fa13d19ac4ed1aad75c9
Merge commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9'

* commit 'd32571626a2c36c026b7fa13d19ac4ed1aad75c9':
  build: Add VSX-OBJS to SUBDIR_VARS

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