Merge branch 'master' of github.com:Sankore/Sankore-3.1
Conflicts: src/board/UBFeaturesController.cpp src/gui/UBFeaturesWidget.cpp
Showing
Please register or sign in to comment
Conflicts: src/board/UBFeaturesController.cpp src/gui/UBFeaturesWidget.cpp