Merge branch 'develop' of https://github.com/beru/nana into beru-develop

2019-04-16 23:39:40 +08:00
parent fd120c6425 a596c7f64e
commit f274ff4c4c
62 changed files with 183 additions and 183 deletions
--- a/source/gui/timer.cpp
+++ b/source/gui/timer.cpp
@@ -10,7 +10,7 @@
 *	@file: nana/gui/timer.hpp
 *	@description:
 *		A timer can repeatedly call a piece of code. The duration between
- *	calls is specified in milliseconds. Timer is defferent from other graphics
+ *	calls is specified in milliseconds. Timer is different from other graphics
 *	controls, it has no graphics interface.
 *	@contributors: Benjamin Navarro(pr#81)
 */