summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2017-03-04 12:28:26 +0800
committerruki <[email protected]>2017-03-04 12:28:26 +0800
commit5ba22ca230c3f3f9477491df6d39f11d53132fb1 (patch)
treea51c221ff46f7f5e6ea9b0c1b7afa9499e264cff
parent9c57f81f0a4884da44e27a1e6ea7fc09fa49e3a3 (diff)
modify changelogsv2.1.1
-rw-r--r--CHANGELOG.md4
-rw-r--r--installer.nsi2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 554d7a1a3..a618ba279 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## master (unreleased)
+## v2.1.1
+
### New features
* Add `--links`, `--linkdirs` and `--includedirs` configure arguments
@@ -201,6 +203,8 @@
## master (开发中)
+## v2.1.1
+
### 新特性
* 添加`--links`, `--linkdirs` and `--includedirs` 配置参数
diff --git a/installer.nsi b/installer.nsi
index f9579ac8c..0a2fe8db5 100644
--- a/installer.nsi
+++ b/installer.nsi
@@ -49,7 +49,7 @@ RequestExecutionLevel admin
;--------------------------------
; Version Information
-VIProductVersion "2.1.1.2602"
+VIProductVersion "2.1.1.0304"
VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "XMake"
VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "website: http://www.xmake.io"
VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The TBOOX Open Source Group"