Merge 'upstream/master' - At least it builds...

This commit is contained in:
furrtek 2017-01-16 03:45:44 +00:00
commit 5e40669cbc
298 changed files with 8122 additions and 4685 deletions

View file

@ -148,11 +148,11 @@ LoadModuleView::LoadModuleView(
)
{
add_children({ {
add_children({
&text_info,
&text_infob,
&button_ok
} });
});
_hash = hash;