Merge branch 'nasm-2.14.xx'
commite35885152632ca207386dd07202a3e373c7dd60d
authorCyrill Gorcunov <gorcunov@gmail.com>
Mon, 12 Nov 2018 22:09:27 +0000 (13 01:09 +0300)
committerCyrill Gorcunov <gorcunov@gmail.com>
Mon, 12 Nov 2018 22:09:27 +0000 (13 01:09 +0300)
tree90eaa7cf33be38554a77eb9e2f269b70035b6ff0
parentfcc85aeef70d60032f3a8794a9340225814f052b
parentbf6230baa909cd66455abd83b81f97d692f3456f
Merge branch 'nasm-2.14.xx'

* nasm-2.14.xx:
  preproc: command-line preproc directive after system-generated

gorcunov@: Had to fix include_path StrList conversion,
it is a bit ugly by now, will rework.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
asm/nasm.c