Merge branch '2.2' into 2.3

This commit is contained in:
Esa Korhonen
2019-06-27 14:20:42 +03:00
4 changed files with 55 additions and 15 deletions

View File

@ -34,3 +34,6 @@ extern const string FIELD_ANYDB;
extern const string FIELD_AUTHSTR;
extern const string FIELD_PROXY;
extern const int NUM_FIELDS;
extern const char* SQLITE_OPEN_FAIL;
extern const char* SQLITE_OPEN_OOM;