1ae101ab44
Merge most of the devbranch work (up until splitting the core starts) into rr1-maint. This is mostly to make maintenance easier, even if it introduces some changes that could be bit big into maint branch. Conflicts: src/platform/wxwidgets/mainwindow.cpp |
||
|---|---|---|
| .. | ||
| menu_dump.hpp | ||
| platform.hpp | ||
| window_mainwindow.hpp | ||
| window_messages.hpp | ||
| window_romselect.hpp | ||
| window_status.hpp | ||