Skip to content

Commit ef6fa11

Browse files
authored
Merge pull request dlang#1436 from MartinNowak/merge_stable
Merge remote-tracking branch 'upstream/stable' into merge_stable
2 parents 8f3b976 + 53b4a7e commit ef6fa11

File tree

3 files changed

+30
-4
lines changed

3 files changed

+30
-4
lines changed

changelog/2.071.2_pre.dd

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Ddoc
2+
3+
$(CHANGELOG_NAV_LAST 2.071.1)
4+
5+
$(VERSION August 7, 2016, =================================================,
6+
7+
$(BR)$(BIG List of all bug fixes and enhancements in D $(VER):)
8+
9+
$(BUGSTITLE DMD Compiler regressions,
10+
11+
$(P
12+
$(LI $(BUGZILLA 15900): [REG 2.071] $(LPAREN)Import deprecation$(RPAREN) Public import ignored when using fully qualified name)
13+
$(LI $(BUGZILLA 16188): [REG2.069] ICE on invalid code)
14+
$(LI $(BUGZILLA 16225): [REG 2.068] Internal error cod1.c 1338 with -O)
15+
$(LI $(BUGZILLA 16316): [REG 2.071] $(LPAREN)Import deprecation$(RPAREN) fully qualified name of imports in mixin template not accessible)
16+
)
17+
)
18+
19+
)
20+
$(CHANGELOG_NAV_LAST 2.071.1)
21+
22+
Macros:
23+
VER=2.071.2
24+
TITLE=Change Log: $(VER)

download.dd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,10 @@ Macros:
167167

168168
DMDV2=$(LATEST)
169169

170-
BETA=$(COMMENT $0)
171-
_=BETA=$0
172-
B_DMDV2=2.071.1
173-
B_SUFFIX=b2
170+
_=BETA=$(COMMENT $0)
171+
BETA=$0
172+
B_DMDV2=2.071.2
173+
B_SUFFIX=b1
174174

175175
DEB32=$(DLSITE dmd_$(DMDV2)-0_i386.deb)
176176
DEB64=$(DLSITE dmd_$(DMDV2)-0_amd64.deb)

win32.mak

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,8 @@ changelog\2.071.0.html : $(CHANGELOG_DDOC) changelog\2.071.0.dd
342342
$(DMD) -o- -c -D -Df$*.html $(CHANGELOG_DDOC) $*.dd
343343
changelog\2.071.1.html : $(CHANGELOG_DDOC) changelog\2.071.1.dd
344344
$(DMD) -o- -c -D -Df$*.html $(CHANGELOG_DDOC) $*.dd
345+
changelog\2.071.2.html : $(CHANGELOG_PRE_DDOC) changelog\2.071.1_pre.dd
346+
$(DMD) -o- -c -D -Df$*.html $(CHANGELOG_PRE_DDOC) $*.dd
345347
changelog\index.html : $(CHANGELOG_DDOC) changelog\index.dd
346348
$(DMD) -o- -c -D -Df$*.html $(CHANGELOG_DDOC) $*.dd
347349

0 commit comments

Comments
 (0)