jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolved conflict

Browse source
This commit is contained in:
Araq 2014-09-13 17:59:37 +02:00
commit 838871b4d9
21 changed files with 382 additions and 279 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/main.nim
View file

@ -299,6 +299,7 @@ proc mainCommand* =
else:
rawMessage(errInvalidCommandX, command)
of "doc":
wantMainModule()
gCmd = cmdDoc
loadConfigs(DocConfig)
commandDoc()
@ -316,6 +317,7 @@ proc mainCommand* =
loadConfigs(DocTexConfig)
commandRst2TeX()
of "jsondoc":
wantMainModule()
gCmd = cmdDoc
loadConfigs(DocConfig)
wantMainModule()