Merge commit '3c0efbd03349ae68d3a25a082222652a102e3fd4'
authorJames Almer <jamrial@gmail.com>
Wed, 11 Oct 2017 21:40:29 +0000 (18:40 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 11 Oct 2017 21:40:29 +0000 (18:40 -0300)
commit9908eac218661de44fb2da65860bd987c807af17
treedf31b7f8f817e823254e13ea08a0f6e4000b0213
parent5adc1f14f91b762d8e7a7056e98a1ede82a58b6c
parent3c0efbd03349ae68d3a25a082222652a102e3fd4
Merge commit '3c0efbd03349ae68d3a25a082222652a102e3fd4'

* commit '3c0efbd03349ae68d3a25a082222652a102e3fd4':
  build: Allow generating dependencies as a side-effect of assembling
  build: Generalize yasm/nasm-related variable names

This commit is a noop, see
fd502f4f5fe8d2f241102ca9a529aa7f88209c22
0cc0c5b6dbf187f9c096de03d999da040197ffe6

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