Merge branch '2.2' into develop

This commit is contained in:
Markus Mäkelä
2018-06-06 08:56:31 +03:00
26 changed files with 140 additions and 57 deletions

View File

@ -177,6 +177,7 @@ extern const char CN_STRIP_DB_ESC[];
extern const char CN_SUBSTITUTE_VARIABLES[];
extern const char CN_THREADS[];
extern const char CN_THREAD_STACK_SIZE[];
extern const char CN_TICKS[];
extern const char CN_TYPE[];
extern const char CN_UNIX[];
extern const char CN_USER[];