Merge branch 'nasm-2.14.xx'
commiteb82f993679d8552d05bfc671bb3909c8f3f0573
authorCyrill Gorcunov <gorcunov@gmail.com>
Sun, 21 Oct 2018 12:06:36 +0000 (21 15:06 +0300)
committerCyrill Gorcunov <gorcunov@gmail.com>
Sun, 21 Oct 2018 12:06:36 +0000 (21 15:06 +0300)
tree985ed6aacdda386224fa7c4bcbe814ca7b87d0df
parent1f620b8e8445d9f61a309f536e670e49adb16542
parentfdb1a1b15130d858d51916cca7e09a2566c4b69f
Merge branch 'nasm-2.14.xx'

* nasm-2.14.xx:
  preproc: Make the preprocessor use nasm_catfile for include
  path: nasm_catfile -- Fix incorrect return of filename only
asm/preproc.c