Merge with develop
commit31ad00a241880aec199360b3d6524e2568860d6c
authorNimetu <nimetu@gmail.com>
Thu, 27 Sep 2018 09:37:59 +0000 (27 12:37 +0300)
committerNimetu <nimetu@gmail.com>
Thu, 27 Sep 2018 09:37:59 +0000 (27 12:37 +0300)
tree94aba897a62a020316e3fb6cf5e58d64d24affe2
parent3157984c21345c7ce8d9db4f4ab98e763c2f03cb
parentc2ffa714d2efdfe686a92b755e1851df0a8e86f5
Merge with develop

--HG--
branch : experimental-ui-scaling
code/nel/src/gui/view_text.cpp