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

Matthias Klumpp mak at moszumanska.debian.org
Thu Jul 13 20:53:58 UTC 2017


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 162c2644508be0836666bc26021b756b91a17e03
Merge: fd79016 2a13eae
Author: Martin <noone at nowhere.com>
Date:   Sat Mar 4 23:30:04 2017 +0100

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

 CMakeLists.txt                                     |  10 ++
 ddmd/cond.d                                        |   2 +
 driver/cl_options.cpp                              | 132 ++++++++-----------
 driver/main.cpp                                    |  12 ++
 gen/arrays.cpp                                     | 121 ++++++++++++++++-
 gen/runtime.cpp                                    |  10 ++
 runtime/CMakeLists.txt                             |  26 +++-
 runtime/phobos                                     |   2 +-
 .../profile-rt/profile-rt-50/InstrProfilingFile.c  |  20 ++-
 tests/codegen/array_equals_memcmp.d                | 146 +++++++++++++++++++++
 tests/codegen/const_struct.d                       |  12 ++
 tests/codegen/const_struct_export.d                |  20 +++
 12 files changed, 417 insertions(+), 96 deletions(-)

diff --cc runtime/phobos
index 0f10d8b,07d55d1..52a10cf
--- a/runtime/phobos
+++ b/runtime/phobos
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 0f10d8bdb4ef4befc6bc9b18bdd71521ee9ba2a4
 -Subproject commit 07d55d12075647d7885d6fd61f11833c96286e31
++Subproject commit 52a10cf33096ab4e90a676cf0ce7fac3246f953d

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



More information about the pkg-d-commits mailing list