Browse Source

Merge branch 'future' into python_api

Former-commit-id: 4162392351
tempestpy_adaptions
sjunges 9 years ago
parent
commit
0730d8bcd3
  1. 1
      src/utility/initialize.cpp
  2. 3
      src/utility/initialize.h

1
src/utility/initialize.cpp

@ -1,5 +1,6 @@
#include "initialize.h"
#include "macros.h"
#include "src/settings/SettingsManager.h"
#include "src/settings/modules/DebugSettings.h"

3
src/utility/initialize.h

@ -8,8 +8,7 @@
#include "log4cplus/loggingmacros.h"
#include "log4cplus/consoleappender.h"
#include "log4cplus/fileappender.h"
extern log4cplus::Logger logger;
extern log4cplus::Logger printer;
#include "macros.h"
#include "src/settings/SettingsManager.h"

Loading…
Cancel
Save