summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryangfl <yangfl@users.noreply.github.com>2018-01-11 13:38:48 +0800
committeryangfl <yangfl@users.noreply.github.com>2018-01-12 21:22:44 +0800
commit449c3f12cc7d2fb0743c35b8af44b86217855f2f (patch)
treebf04b1a06e672351e26a8f3817a861c1a4568370
parent2fbed5b4c55ca92edbd436d4d0fa0a35506855c3 (diff)
Fix some typos in code and cmake comments
-rw-r--r--CHANGELOG.md2
-rw-r--r--auto_tests/conference_test.c2
-rw-r--r--cmake/ModulePackage.cmake2
3 files changed, 3 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40f43341..9a975044 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -331,7 +331,7 @@
331 331
332### Merged PRs: 332### Merged PRs:
333 333
334- [#207](https://github.com/TokTok/c-toxcore/pull/207) docs: correct instructions for cloning & harden agains repo name changes 334- [#207](https://github.com/TokTok/c-toxcore/pull/207) docs: correct instructions for cloning & harden against repo name changes
335- [#206](https://github.com/TokTok/c-toxcore/pull/206) Corrected libsodium tag 335- [#206](https://github.com/TokTok/c-toxcore/pull/206) Corrected libsodium tag
336- [#204](https://github.com/TokTok/c-toxcore/pull/204) Error if format_test can't be executed. 336- [#204](https://github.com/TokTok/c-toxcore/pull/204) Error if format_test can't be executed.
337- [#202](https://github.com/TokTok/c-toxcore/pull/202) Version Patch v0.0.2 337- [#202](https://github.com/TokTok/c-toxcore/pull/202) Version Patch v0.0.2
diff --git a/auto_tests/conference_test.c b/auto_tests/conference_test.c
index 46b58224..150236b3 100644
--- a/auto_tests/conference_test.c
+++ b/auto_tests/conference_test.c
@@ -90,7 +90,7 @@ group_test_restart:
90 int test_run = 0; 90 int test_run = 0;
91 long long unsigned int cur_time = time(NULL); 91 long long unsigned int cur_time = time(NULL);
92 struct Tox_Options *opts = tox_options_new(NULL); 92 struct Tox_Options *opts = tox_options_new(NULL);
93 /* FIXME: Currenly here is problems with IPv6 */ 93 /* FIXME: Currently here is problems with IPv6 */
94 tox_options_set_ipv6_enabled(opts, false); 94 tox_options_set_ipv6_enabled(opts, false);
95 95
96 for (i = 0; i < NUM_GROUP_TOX; ++i) { 96 for (i = 0; i < NUM_GROUP_TOX; ++i) {
diff --git a/cmake/ModulePackage.cmake b/cmake/ModulePackage.cmake
index d51607df..c38e7de0 100644
--- a/cmake/ModulePackage.cmake
+++ b/cmake/ModulePackage.cmake
@@ -142,7 +142,7 @@ function(target_link_modules target)
142 # If it's neither, then it's an executable. 142 # If it's neither, then it's an executable.
143 if(NOT _targets) 143 if(NOT _targets)
144 set(_targets ${_targets} ${target}) 144 set(_targets ${_targets} ${target})
145 # Executables preferrably link against static libraries, so they are 145 # Executables preferably link against static libraries, so they are
146 # standalone and can be shipped without any external dependencies. As a 146 # standalone and can be shipped without any external dependencies. As a
147 # frame of reference: nTox becomes an 1.3M binary instead of 139K on x86_64 147 # frame of reference: nTox becomes an 1.3M binary instead of 139K on x86_64
148 # Linux. 148 # Linux.