[dmd-internals] [D-Programming-Language/dmd] f1130b: fix Issue 12242 - conflict error with public impor...

[GitHub via dmd-internals]

  Branch: refs/heads/master
  Home:   https://github.com/D-Programming-Language/dmd
  Commit: f1130bf5762a21697708a3fe94eb291cdf4c3074
      https://github.com/D-Programming-Language/dmd/commit/f1130bf5762a21697708a3fe94eb291cdf4c3074
  Author: k-hara <k.hara.pg at gmail.com>
  Date:   2014-07-28 (Mon, 28 Jul 2014)

  Changed paths:
    M src/dsymbol.c
    A test/compilable/imports/imp12242a.d
    A test/compilable/imports/imp12242a1.d
    A test/compilable/imports/imp12242a2.d
    A test/compilable/imports/imp12242b.d
    A test/compilable/imports/imp12242b1.d
    A test/compilable/imports/imp12242b2.d
    A test/compilable/testimport12242.d

  Log Message:
  -----------
  fix Issue 12242 - conflict error with public imports


  Commit: 0a3d275286d8761cf41a86f94498012a38bd05ac
      https://github.com/D-Programming-Language/dmd/commit/0a3d275286d8761cf41a86f94498012a38bd05ac
  Author: k-hara <k.hara.pg at gmail.com>
  Date:   2014-07-28 (Mon, 28 Jul 2014)

  Changed paths:
    M src/dsymbol.c
    M src/dsymbol.h

  Log Message:
  -----------
  [Refactoring] Add ScopeDsymbol::mergeOverloadSet


  Commit: 79a406dfdbeda7d1f5b21e52252c07cb6a6cc839
      https://github.com/D-Programming-Language/dmd/commit/79a406dfdbeda7d1f5b21e52252c07cb6a6cc839
  Author: AndrewEdwards <edwards.ac at gmail.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M src/dsymbol.c
    M src/dsymbol.h
    A test/compilable/imports/imp12242a.d
    A test/compilable/imports/imp12242a1.d
    A test/compilable/imports/imp12242a2.d
    A test/compilable/imports/imp12242b.d
    A test/compilable/imports/imp12242b1.d
    A test/compilable/imports/imp12242b2.d
    A test/compilable/testimport12242.d

  Log Message:
  -----------
  Merge pull request #3388 from 9rnsr/fix12242

Issue 12242 - conflict error with public imports


Compare: https://github.com/D-Programming-Language/dmd/compare/02c6399f67af...79a406dfdbed