Branch: refs/heads/master
  Home:   https://github.com/D-Programming-Language/dmd
  Commit: 61f79a8aa18a2d551cfeb7c1bc218ebc3f21cfc6
      https://github.com/D-Programming-Language/dmd/commit/61f79a8aa18a2d551cfeb7c1bc218ebc3f21cfc6
  Author: k-hara <k.hara.pg@gmail.com>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M src/inline.c
    M src/template.c
    A test/runnable/imports/std15021conv.d
    A test/runnable/imports/std15021format.d
    A test/runnable/link15021.d

  Log Message:
  -----------
  fix Issue 15021 - linker error with speculative instantiation and -inline


  Commit: 334e29178254ef0f02639b595a75f906e1b357ee
      https://github.com/D-Programming-Language/dmd/commit/334e29178254ef0f02639b595a75f906e1b357ee
  Author: Martin Nowak <code@dawg.eu>
  Date:   2015-09-08 (Tue, 08 Sep 2015)

  Changed paths:
    M src/inline.c
    M src/template.c
    A test/runnable/imports/std15021conv.d
    A test/runnable/imports/std15021format.d
    A test/runnable/link15021.d

  Log Message:
  -----------
  Merge pull request #5055 from 9rnsr/fix15021

[REG2.068.1] Issue 15021 - linker error with speculative instantiation and -inline


  Commit: d96a64973467d54a91693f87511da7289d1e1b71
      https://github.com/D-Programming-Language/dmd/commit/d96a64973467d54a91693f87511da7289d1e1b71
  Author: k-hara <k.hara.pg@gmail.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/glue.c
    A test/runnable/ice15030.d
    A test/runnable/imports/a15030.d
    A test/runnable/imports/b15030.d
    A test/runnable/imports/std15030algo.d

  Log Message:
  -----------
  fix Issue 15030 - ICE with recursive delegate, -unittest, and std.range

Refer the detailed explanation in `test/runnable/ice15030.d`.


  Commit: e7898a69ee6c24b7a8b2ec934b75a64c707c6688
      https://github.com/D-Programming-Language/dmd/commit/e7898a69ee6c24b7a8b2ec934b75a64c707c6688
  Author: k-hara <k.hara.pg@gmail.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/template.c
    M test/runnable/ice15030.d

  Log Message:
  -----------
  Fix 'enclosing' symbol propagation in TemplateInstance::hasNestedArgs


  Commit: a77a2e30c53ad71f76b43ac73c672359f283f813
      https://github.com/D-Programming-Language/dmd/commit/a77a2e30c53ad71f76b43ac73c672359f283f813
  Author: k-hara <k.hara.pg@gmail.com>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/template.c
    M test/runnable/ice15030.d

  Log Message:
  -----------
  Revert hasNestedArgs change, and instead tweak apppendToModuleMembers

Sadly today, `TemplateInstance::enclosing == NULL` is not equivalent with "the template instance is not nested". Because of the inconsistency, setting enclosing will break processes in other places.


  Commit: ea5d85af7abf0b1e36fd42a8d98fd692a765dea0
      https://github.com/D-Programming-Language/dmd/commit/ea5d85af7abf0b1e36fd42a8d98fd692a765dea0
  Author: Martin Nowak <code@dawg.eu>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/glue.c
    M src/template.c
    A test/runnable/ice15030.d
    A test/runnable/imports/a15030.d
    A test/runnable/imports/b15030.d
    A test/runnable/imports/std15030algo.d

  Log Message:
  -----------
  Merge pull request #5058 from 9rnsr/fix15030

[REG2.068.1] Issue 15030 - ICE with recursive delegate, -unittest, and std.range


  Commit: dd6786bd6a577acf8c097407e70e8674ddbfd33b
      https://github.com/D-Programming-Language/dmd/commit/dd6786bd6a577acf8c097407e70e8674ddbfd33b
  Author: Martin Nowak <code@dawg.eu>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/aggregate.h
    M src/aliasthis.c
    M src/arrayop.c
    M src/backend/cod2.c
    M src/clone.c
    M src/cppmangle.c
    M src/declaration.c
    M src/dsymbol.c
    M src/dsymbol.h
    M src/e2ir.c
    M src/expression.c
    M src/expression.h
    M src/func.c
    M src/glue.c
    M src/inline.c
    M src/magicport.json
    M src/mtype.c
    M src/mtype.h
    M src/nogc.c
    M src/opover.c
    M src/optimize.c
    M src/parse.c
    M src/parse.h
    M src/statement.c
    M src/struct.c
    M src/template.c
    M src/template.h
    M src/toobj.c
    M src/typinf.c
    M test/compilable/b1215.d
    A test/compilable/ice12554.d
    A test/compilable/test14781.d
    A test/compilable/test14962.d
    A test/compilable/test14973.d
    M test/fail_compilation/diag9831.d
    R test/fail_compilation/fail1.d
    M test/fail_compilation/fail11545.d
    M test/fail_compilation/fail120.d
    R test/fail_compilation/fail2.d
    M test/fail_compilation/fail39.d
    M test/fail_compilation/fail9.d
    R test/fail_compilation/fail9148.d
    A test/fail_compilation/fail_opover.d
    R test/fail_compilation/ice12554.d
    A test/fail_compilation/ice14621.d
    A test/fail_compilation/ice14923.d
    A test/fail_compilation/ice14929.d
    A test/fail_compilation/ice15002.d
    M test/fail_compilation/ice9865.d
    M test/runnable/aliasthis.d
    A test/runnable/extra-files/linkdebug.d
    A test/runnable/extra-files/linkdebug_primitives.d
    A test/runnable/extra-files/linkdebug_range.d
    A test/runnable/extra-files/linkdebug_uni.d
    M test/runnable/extra-files/test14198.d
    A test/runnable/ice15030.d
    A test/runnable/imports/a15030.d
    A test/runnable/imports/b15030.d
    A test/runnable/imports/linktypeinfo_file.d
    A test/runnable/imports/std15017variant.d
    A test/runnable/imports/std15021conv.d
    A test/runnable/imports/std15021format.d
    A test/runnable/imports/std15030algo.d
    A test/runnable/imports/test14901a.d
    A test/runnable/imports/test14901b.d
    A test/runnable/imports/test14901c.d
    A test/runnable/imports/test14901d.d
    M test/runnable/link14198b.sh
    A test/runnable/link15017.d
    A test/runnable/link15021.d
    A test/runnable/linkdebug.sh
    A test/runnable/linktypeinfo.d
    M test/runnable/opover2.d
    M test/runnable/sctor.d
    M test/runnable/sdtor.d
    A test/runnable/test14901.d

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/stable' into merge_stable_convert

Conflicts:
	src/opover.c
	test/runnable/sdtor.d


  Commit: 7f1585fa494cac97c182d2ae052e787df016bcdc
      https://github.com/D-Programming-Language/dmd/commit/7f1585fa494cac97c182d2ae052e787df016bcdc
  Author: Martin Nowak <code@dawg.eu>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    R src/access.c
    A src/access.d
    A src/aggregate.d
    R src/aliasthis.c
    A src/aliasthis.d
    R src/apply.c
    A src/apply.d
    R src/argtypes.c
    A src/argtypes.d
    R src/arrayop.c
    A src/arrayop.d
    A src/arraytypes.d
    R src/attrib.c
    A src/attrib.d
    R src/builtin.c
    A src/builtin.d
    R src/canthrow.c
    A src/canthrow.d
    R src/cast.c
    R src/class.c
    R src/clone.c
    A src/clone.d
    R src/cond.c
    A src/cond.d
    R src/constfold.c
    A src/constfold.d
    R src/cppmangle.c
    A src/cppmangle.d
    R src/ctfeexpr.c
    A src/ctfeexpr.d
    A src/dcast.d
    A src/dclass.d
    R src/declaration.c
    A src/declaration.d
    R src/delegatize.c
    A src/delegatize.d
    A src/denum.d
    A src/dimport.d
    A src/dinifile.d
    A src/dinterpret.d
    A src/dmacro.d
    A src/dmangle.d
    A src/dmodule.d
    R src/doc.c
    A src/doc.d
    A src/dscope.d
    A src/dstruct.d
    R src/dsymbol.c
    A src/dsymbol.d
    A src/dtemplate.d
    A src/dunittest.d
    A src/dversion.d
    R src/entity.c
    R src/enum.c
    R src/errors.c
    A src/errors.d
    R src/escape.c
    A src/escape.d
    R src/expression.c
    A src/expression.d
    R src/func.c
    A src/func.d
    R src/globals.c
    A src/globals.d
    R src/hdrgen.c
    A src/hdrgen.d
    R src/identifier.c
    A src/identifier.d
    R src/imphint.c
    A src/imphint.d
    R src/import.c
    R src/inifile.c
    R src/init.c
    A src/init.d
    R src/inline.c
    A src/inline.d
    R src/interpret.c
    R src/intrange.c
    R src/json.c
    A src/json.d
    R src/lexer.c
    A src/lexer.d
    A src/lib.d
    R src/link.c
    A src/link.d
    R src/macro.c
    R src/mangle.c
    R src/mars.c
    A src/mars.d
    R src/module.c
    R src/mtype.c
    A src/mtype.d
    R src/nogc.c
    A src/nogc.d
    R src/nspace.c
    A src/nspace.d
    R src/objc.c
    A src/objc.d
    R src/objc_stubs.c
    R src/opover.c
    A src/opover.d
    R src/optimize.c
    A src/optimize.d
    R src/parse.c
    A src/parse.d
    R src/root/aav.c
    A src/root/aav.d
    R src/root/async.c
    R src/root/async.h
    R src/root/checkedint.c
    R src/root/checkedint.h
    R src/root/file.c
    A src/root/file.d
    R src/root/filename.c
    A src/root/filename.d
    R src/root/longdouble.c
    R src/root/man.c
    A src/root/man.d
    R src/root/object.c
    R src/root/outbuffer.c
    A src/root/outbuffer.d
    R src/root/port.c
    R src/root/response.c
    A src/root/response.d
    R src/root/rmem.c
    R src/root/speller.c
    A src/root/speller.d
    R src/root/stringtable.c
    A src/root/stringtable.d
    R src/sapply.c
    A src/sapply.d
    R src/scope.c
    R src/sideeffect.c
    A src/sideeffect.d
    R src/statement.c
    A src/statement.d
    R src/staticassert.c
    A src/staticassert.d
    R src/struct.c
    R src/target.c
    A src/target.d
    R src/template.c
    R src/tokens.c
    A src/tokens.d
    R src/traits.c
    A src/traits.d
    R src/unittests.c
    R src/utf.c
    A src/utf.d
    R src/version.c
    A src/visitor.d

  Log Message:
  -----------
  convert C++ -> D


  Commit: b1cea21014d2cdbda4b6172fb1a7dd3e77f44efc
      https://github.com/D-Programming-Language/dmd/commit/b1cea21014d2cdbda4b6172fb1a7dd3e77f44efc
  Author: Martin Nowak <code@dawg.eu>
  Date:   2015-09-09 (Wed, 09 Sep 2015)

  Changed paths:
    M src/dtemplate.d
    M src/glue.c
    M src/inline.d
    A test/runnable/ice15030.d
    A test/runnable/imports/a15030.d
    A test/runnable/imports/b15030.d
    A test/runnable/imports/std15021conv.d
    A test/runnable/imports/std15021format.d
    A test/runnable/imports/std15030algo.d
    A test/runnable/link15021.d

  Log Message:
  -----------
  Merge branch 'merge_stable_convert' into merge_stable

Conflicts:
	src/access.d
	src/aggregate.d
	src/aliasthis.d
	src/apply.d
	src/argtypes.d
	src/arrayop.d
	src/arraytypes.d
	src/attrib.d
	src/builtin.d
	src/canthrow.d
	src/clone.d
	src/cond.d
	src/constfold.d
	src/cppmangle.d
	src/ctfeexpr.d
	src/dcast.d
	src/dclass.d
	src/declaration.d
	src/delegatize.d
	src/denum.d
	src/dimport.d
	src/dinterpret.d
	src/dmacro.d
	src/dmangle.d
	src/dmodule.d
	src/doc.d
	src/dscope.d
	src/dstruct.d
	src/dsymbol.d
	src/dtemplate.d
	src/dversion.d
	src/errors.d
	src/escape.d
	src/expression.d
	src/func.d
	src/globals.d
	src/hdrgen.d
	src/identifier.d
	src/init.d
	src/inline.d
	src/json.d
	src/lexer.d
	src/lib.d
	src/link.d
	src/mars.d
	src/mtype.d
	src/nogc.d
	src/nspace.d
	src/objc.d
	src/opover.d
	src/optimize.d
	src/parse.d
	src/root/file.d
	src/root/man.d
	src/root/outbuffer.d
	src/sapply.d
	src/sideeffect.d
	src/statement.d
	src/staticassert.d
	src/target.d
	src/tokens.d
	src/traits.d
	src/visitor.d


  Commit: f4071295719e71d39010b3f3e73ffd631293b880
      https://github.com/D-Programming-Language/dmd/commit/f4071295719e71d39010b3f3e73ffd631293b880
  Author: Hara Kenji <k.hara.pg+dev@gmail.com>
  Date:   2015-09-10 (Thu, 10 Sep 2015)

  Changed paths:
    M src/dtemplate.d
    M src/glue.c
    M src/inline.d
    A test/runnable/ice15030.d
    A test/runnable/imports/a15030.d
    A test/runnable/imports/b15030.d
    A test/runnable/imports/std15021conv.d
    A test/runnable/imports/std15021format.d
    A test/runnable/imports/std15030algo.d
    A test/runnable/link15021.d

  Log Message:
  -----------
  Merge pull request #5061 from MartinNowak/merge_stable

Merge branch 'merge_stable_convert' into merge_stable


Compare: https://github.com/D-Programming-Language/dmd/compare/e9808b5f7cbf...f4071295719e