73fd1d4737
Conflicts: include/core/loadlib.hpp src/core/loadlib.cpp src/platform/wxwidgets/mainwindow.cpp |
||
---|---|---|
.. | ||
menu_dump.hpp | ||
menu_recent.hpp | ||
platform.hpp | ||
textrender.hpp | ||
window_mainwindow.hpp | ||
window_messages.hpp | ||
window_status.hpp |