Merge branch 'master' into socket_api
* master: Add macro to declare vptr without symbol export attribute. Fix build on Windows 10. Increase version number to 1.6.0 Update README.md Rename README into README.md Fix build. fix issue #3620 (lost registration forever) occuring when multiple transactions notify a same channel about a timeout.
Showing with 116 additions and 118 deletions