Merge pull request #1666 from MartinNowak/merge_stable

MartinNowak · web-flow · commit 0cc0d8438ffd · 2017-06-01T21:13:15.000+02:00
Merge remote-tracking branch 'upstream/stable' into merge_stable
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.074.0
+2.074.1
diff --git a/changelog/2.074.0.dd b/changelog/2.074.0.dd
@@ -1,6 +1,6 @@
 Ddoc
 
-$(CHANGELOG_NAV_LAST 2.073.2)
+$(CHANGELOG_NAV 2.073.2,2.074.1)
 
 $(VERSION Apr 10, 2017, =================================================,
 
@@ -414,7 +414,7 @@ $(BUGSTITLE Tools bugs,
 $(LI $(BUGZILLA 17139): [BLOCKING] dscanner needs to handle 'scope' function attributes)
 )
 )
-$(CHANGELOG_NAV_LAST 2.073.2)
+$(CHANGELOG_NAV 2.073.2,2.074.1)
 Macros:
     VER=2.074.0
     TITLE=Change Log: $(VER)
diff --git a/changelog/2.074.1.dd b/changelog/2.074.1.dd
diff --git a/changelog/changelog.ddoc b/changelog/changelog.ddoc
@@ -66,6 +66,7 @@ _=
 CHANGELOG_VERSION = $(LI <a id="$0" href="$0.html">$0</a>)
 _=BEGIN_GENERATED_CHANGELOG_VERSIONS
 CHANGELOG_VERSIONS =
+    $(CHANGELOG_VERSION 2.074.1)
     $(CHANGELOG_VERSION 2.074.0)
     $(CHANGELOG_VERSION 2.073.2)
     $(CHANGELOG_VERSION 2.073.1)
diff --git a/download.dd b/download.dd
@@ -167,8 +167,8 @@ Macros:
 
     DMDV2=$(LATEST)
 
-    _=BETA=$(COMMENT $0)
-    BETA=$0
+    BETA=$(COMMENT $0)
+    _=BETA=$0
     B_DMDV2=2.074.1
     B_SUFFIX=b1
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`Ddoc`
`2`	`2`
`3`		`-$(CHANGELOG_NAV_LAST 2.073.2)`
	`3`	`+$(CHANGELOG_NAV 2.073.2,2.074.1)`
`4`	`4`
`5`	`5`	`$(VERSION Apr 10, 2017, =================================================,`
`6`	`6`
`@@ -414,7 +414,7 @@ $(BUGSTITLE Tools bugs,`
`414`	`414`	`$(LI $(BUGZILLA 17139): [BLOCKING] dscanner needs to handle 'scope' function attributes)`
`415`	`415`	`)`
`416`	`416`	`)`
`417`		`-$(CHANGELOG_NAV_LAST 2.073.2)`
	`417`	`+$(CHANGELOG_NAV 2.073.2,2.074.1)`
`418`	`418`	`Macros:`
`419`	`419`	`VER=2.074.0`
`420`	`420`	`TITLE=Change Log: $(VER)`