Merge with master

This commit is contained in:
Enrico Turri 2018-07-17 08:54:17 +02:00
commit 8175c9d306
73 changed files with 16444 additions and 133 deletions

View file

@ -175,7 +175,7 @@ protected:
std::vector<std::string> m_reload_dependent_tabs = {};
enum OptStatus { osSystemValue = 1, osInitValue = 2 };
std::map<std::string, int> m_options_list;
int m_opt_status_value;
int m_opt_status_value = 0;
t_icon_descriptions m_icon_descriptions = {};