Merge with develop

--HG-- branch : compatibility-develop
2016-01-11 10:09:58 +01:00 · 2016-01-11 10:09:58 +01:00 · 4c5de7f9b7
commit 4c5de7f9b7
parent e44e131365 d375038175
1 changed files with 2 additions and 0 deletions
--- a/code/ryzom/tools/client/client_config_qt/main.cpp
+++ b/code/ryzom/tools/client/client_config_qt/main.cpp
@ -38,6 +38,8 @@

 int main(sint32 argc, char **argv)
 {
+	NLMISC::CApplicationContext applicationContext;
+
 	QApplication app(argc, argv);

 	QApplication::setWindowIcon(QIcon(":/resources/welcome_icon.png"));