May 31, 2013
  Branch: refs/heads/dmd-1.x
  Home:   https://github.com/D-Programming-Language/dmd
  Commit: b269a91c2fdc253463f87561aed2d932fc785473
      https://github.com/D-Programming-Language/dmd/commit/b269a91c2fdc253463f87561aed2d932fc785473
  Author: Leandro Lucarella <leandro.lucarella@sociomantic.com>
  Date:   2013-05-29 (Wed, 29 May 2013)

  Changed paths:
    M src/mars.c

  Log Message:
  -----------
  Use sc1.ini/dmd1.conf config file if found

Using D2 and D1 (specially with Tango) in the same computer can be
challenging, because both share the same config file name. To ease the
transition, D1 now looks for a file called sc1.ini (Windows) or
dmd1.conf (Posix) first (in the same locations as usual) and only if it
doesn't find it, it looks for the old standard name without the version
number.

This change is somehow backwards compatible (it will only break if for some reason you already had a file with that name) and should be reasonably harmless.


  Commit: af1fd6408fd7a65a1d8aa2793596d6ac0f8b92e7
      https://github.com/D-Programming-Language/dmd/commit/af1fd6408fd7a65a1d8aa2793596d6ac0f8b92e7
  Author: Walter Bright <walter@walterbright.com>
  Date:   2013-05-31 (Fri, 31 May 2013)

  Changed paths:
    M src/mars.c

  Log Message:
  -----------
  Merge pull request #2095 from leandro-lucarella-sociomantic/dmd-1.x

[D1] Use sc1.ini/dmd1.conf config file if found


Compare: https://github.com/D-Programming-Language/dmd/compare/6ecd45ba088e...af1fd6408fd7