Merge fixing, commit to catch up on recent files

This commit is contained in:
furrtek
2016-02-04 10:27:53 +01:00
parent 44638e504b
commit 6e496e2b26
90 changed files with 2257 additions and 1428 deletions

View File

@@ -110,7 +110,7 @@ void AlphanumView::set_uppercase() {
size_t n = 0;
for(auto& button : buttons) {
add_child(&button);
//add_child(&button);
const std::string label {
key_caps[n]
};
@@ -125,7 +125,7 @@ void AlphanumView::set_lowercase() {
size_t n = 0;
for(auto& button : buttons) {
add_child(&button);
//add_child(&button);
const std::string label {
key_caps[n]
};