resolve merge conflicts

This commit is contained in:
Araq 2018-12-12 18:16:53 +01:00
commit 0ab1229c69
9 changed files with 367 additions and 147 deletions

View file

@ -154,7 +154,7 @@ proc bundleNimsuggest() =
nimCompile("nimsuggest/nimsuggest.nim", options = "-d:release")
proc buildVccTool() =
nimCompile("tools/vccenv/vccexe.nim")
nimCompile("tools/vccexe/vccexe.nim")
proc bundleWinTools() =
# TODO: consider building under `bin` instead of `.`