Merge pull request #1282 from beru/release/v2.4.1-beta2-fork

beru · web-flow · commit 3fc1936ff06f · 2020-05-11T00:00:58.000+09:00
v2.4.1 beta2 リリース準備
diff --git a/help/sakura/res/HLP000001.html b/help/sakura/res/HLP000001.html
@@ -15,7 +15,7 @@
 -->
 <br>
 <center><hr width = "350px"></center>
-<center>サクラエディタ   Ver 2.4.1 (開発版)</center>
+<center>サクラエディタ   Ver 2.4.1 (Beta2)</center>
 <center>ヘルプファイル最終更新日 2020/04/19</center>
 <center><a href="https://sakura-editor.github.io/" target=_blank>https://sakura-editor.github.io/</a></center>
 <center><hr width = "350px"></center>
diff --git a/sakura/githash.bat b/sakura/githash.bat
@@ -249,7 +249,7 @@ exit /b 0
 	)
 
 	@rem enable 'dev version' macro which will be disabled on release branches
-	echo #define DEV_VERSION
+	@rem echo #define DEV_VERSION
 
 	if "%CI_ACCOUNT_NAME%" == "" (
 		echo // CI_ACCOUNT_NAME is not defined

Original file line number	Diff line number	Diff line change
`@@ -249,7 +249,7 @@ exit /b 0`
`249`	`249`	`)`
`250`	`250`
`251`	`251`	`@rem enable 'dev version' macro which will be disabled on release branches`
`252`		`- echo #define DEV_VERSION`
	`252`	`+ @rem echo #define DEV_VERSION`
`253`	`253`
`254`	`254`	`if "%CI_ACCOUNT_NAME%" == "" (`
`255`	`255`	`echo // CI_ACCOUNT_NAME is not defined`