diff options
| author | Araq <rumpf_a@web.de> | 2013-12-05 00:03:27 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2013-12-05 00:03:27 +0100 |
| commit | 5eba93d584d5446256d05f0eef111ace5e12bac3 (patch) | |
| tree | 7b638031f3e77c16ca0c27b9c83630d78846f19e /compiler/nimconf.nim | |
| parent | 9035d15ed22de1f80486d94ec63e720a4d04cbc0 (diff) | |
| parent | 2264875237cb72cf0288f2bd3d4a930c2a1acc50 (diff) | |
| download | Nim-5eba93d584d5446256d05f0eef111ace5e12bac3.tar.gz | |
Merge branch 'master' into vm2
Conflicts: compiler/sem.nim
Diffstat (limited to 'compiler/nimconf.nim')
| -rw-r--r-- | compiler/nimconf.nim | 5 |
1 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")) |