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/widgets/skeletons/content_view.cpp
+++ b/source/gui/widgets/skeletons/content_view.cpp
@@ -277,7 +277,7 @@ namespace nana {
 					else
 					{
 						cv_scroll->horz.close();
-						//If horz is allowed, it indicates the horzontal origin is not moved
+						//If horz is allowed, it indicates the horizontal origin is not moved
 						//Make sure the x origin is zero
 						if (horz_allowed)
 							origin.x = 0;