diff options
| author | Araq <rumpf_a@web.de> | 2013-12-03 01:59:59 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2013-12-03 01:59:59 +0100 |
| commit | 5cb60ffbe0c3afde964467fc2ab99bc3bbd42968 (patch) | |
| tree | d7213872ef41db6b8d0dd9b0cfb04582c52e468b /compiler | |
| parent | fe983b13099dd8d8a93ebefc00174e98eb048dea (diff) | |
| parent | 0628d85a6afd6465f1f7419a09b5bd19d7cdfb6c (diff) | |
| download | Nim-5cb60ffbe0c3afde964467fc2ab99bc3bbd42968.tar.gz | |
Merge branch 'master' of github.com:Araq/Nimrod
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/nimconf.nim | 5 | ||||
| -rw-r--r-- | compiler/nimrod.nimrod.cfg (renamed from compiler/nimrod.cfg) | 0 |
2 files changed, 0 insertions, 5 deletions
diff --git a/compiler/nimconf.nim b/compiler/nimconf.nim index 507812d9c..7ec566a01 100644 --- a/compiler/nimconf.nim +++ b/compiler/nimconf.nim @@ -243,11 +243,6 @@ proc LoadConfigs*(cfg: string) = readConfigFile(pd / cfg) if gProjectName.len != 0: - var conffile = changeFileExt(gProjectFull, "cfg") - if conffile != pd / cfg and existsFile(conffile): - readConfigFile(conffile) - rawMessage(warnConfigDeprecated, conffile) - # new project wide config file: readConfigFile(changeFileExt(gProjectFull, "nimrod.cfg")) diff --git a/compiler/nimrod.cfg b/compiler/nimrod.nimrod.cfg index ac8f732f1..ac8f732f1 100644 --- a/compiler/nimrod.cfg +++ b/compiler/nimrod.nimrod.cfg |