[pkg-d-commits] [ldc] 53/95: Merge branch 'master' into merge-2.073

[Matthias Klumpp]

This is an automated email from the git hooks/post-receive script.

mak pushed a commit to annotated tag v1.3.0-beta1
in repository ldc.

commit 2aebbe4dcfb7ac66ac6e13c64b18654cafd51055
Merge: 88f69e9 94f0421
Author: Martin <noone at nowhere.com>
Date:   Sat Mar 18 14:31:58 2017 +0100

    Merge branch 'master' into merge-2.073
    
    Conflicts:
    	runtime/druntime

 gen/dibuilder.cpp         | 16 +++++++++++++++-
 gen/llvmhelpers.cpp       |  8 ++++++--
 runtime/druntime          |  2 +-
 tests/compilable/gh2033.d | 11 +++++++++++
 4 files changed, 33 insertions(+), 4 deletions(-)

diff --cc runtime/druntime
index 63c9db7,6ce3c20..0f63356
--- a/runtime/druntime
+++ b/runtime/druntime
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 63c9db78e0abde351de25cac62b66e4557f7b9ab
 -Subproject commit 6ce3c20cb3cfb32e75c00fb87f7b2cc08198210a
++Subproject commit 0f6335695efe80b5de781949d1b6f9ce19b2c168

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/ldc.git