Merge branch 'master' of github.com:Araq/Nimrod

2013-12-03 01:59:59 +01:00 · 2013-12-03 01:59:59 +01:00 · 5cb60ffbe0
commit 5cb60ffbe0
parent fe983b1309 0628d85a6a
5 changed files with 339 additions and 17 deletions
--- 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"))
 
--- a/compiler/nimrod.nimrod.cfg
+++ b/compiler/nimrod.nimrod.cfg