diff options
| author | ruki <[email protected]> | 2022-03-01 17:59:50 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-03-01 17:59:50 +0800 |
| commit | fa099d4f9c233a3400bf31e3ace4e33b8af1f526 (patch) | |
| tree | 91ae3f29e1f7a7108e7446eb3a6a5c8679e06766 | |
| parent | 97a253600f9e6c3b4a4ff7273dc2843230a8dc2e (diff) | |
| parent | 4f121e43186a598d2d3b428783deb1d8b6d7696d (diff) | |
Merge pull request #2115 from xq114/dev
fix CHANGELOG.md
| -rw-r--r-- | CHANGELOG.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b66ee7a3..ff134d71a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1226,8 +1226,8 @@ * [#2024](https://github.com/xmake-io/xmake/issues/2024): 添加 asn1c 支持 * [#2031](https://github.com/xmake-io/xmake/issues/2031): 为 add_files 增加 linker scripts 和 version scripts 支持 * [#2033](https://github.com/xmake-io/xmake/issues/2033): 捕获 ctrl-c 去打印当前运行栈，用于调试分析卡死问题 +* [#2059](https://github.com/xmake-io/xmake/pull/2059): 添加 `xmake update --integrate` 命令去整合 shell * [#2070](https://github.com/xmake-io/xmake/issues/2070): 添加一些内置的 xrepo env 环境配置 -* [#2059](https://github.com/xmake-io/xmake/pull/2059): 添加 `xmake update --integrate` 命令去整合 shell* [#2070](https://github.com/xmake-io/xmake/issues/2070): 添加一些内置的 xrepo env 环境配置 ### 改进 |