[dmd-internals] [D-Programming-Language/dmd] aac4e9: merge with D2

[GitHub]

  Branch: refs/heads/dmd-1.x
  Home:   https://github.com/D-Programming-Language/dmd
  Commit: aac4e9335ff62b17a67680229959768bc9484b5b
      https://github.com/D-Programming-Language/dmd/commit/aac4e9335ff62b17a67680229959768bc9484b5b
  Author: Walter Bright <walter at walterbright.com>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Changed paths:
    M src/parse.c

  Log Message:
  -----------
  merge with D2


  Commit: 9e3cc63cf01311477e57eb873c8a9c58c4fde027
      https://github.com/D-Programming-Language/dmd/commit/9e3cc63cf01311477e57eb873c8a9c58c4fde027
  Author: Walter Bright <walter at walterbright.com>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Changed paths:
    M src/mars.c

  Log Message:
  -----------
  Issue 5648 - dmd command line option list inconsistencies


Compare: https://github.com/D-Programming-Language/dmd/compare/9302e96...9e3cc63