![]() Conflicts: data src/app/gamedata.cpp src/ui/control.cpp src/ui/edit.cpp src/ui/maindialog.cpp |
||
---|---|---|
.. | ||
mocks | ||
stubs | ||
CMakeLists.txt | ||
edit_test.cpp |
![]() Conflicts: data src/app/gamedata.cpp src/ui/control.cpp src/ui/edit.cpp src/ui/maindialog.cpp |
||
---|---|---|
.. | ||
mocks | ||
stubs | ||
CMakeLists.txt | ||
edit_test.cpp |