Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Origin commit data
------------------
Branch: ni/coolstream
Commit: ca22349f35
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-11 (Thu, 11 Aug 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-11 12:33:51 +02:00
3 changed files with 6 additions and 29 deletions

View File

@@ -616,6 +616,8 @@ std::string& htmlEntityDecode(std::string& text)
};
decode_table dt[] =
{
{"\n", "&#x0a;"},
{"\n", "&#x0d;"},
{" ", "&nbsp;"},
{"&", "&amp;"},
{"<", "&lt;"},