Merge branch 'master' into background
authorCamila Ayres <smayres@gmail.com>
Mon, 26 Nov 2018 20:07:14 +0000 (21:07 +0100)
committerGitHub <noreply@github.com>
Mon, 26 Nov 2018 20:07:14 +0000 (21:07 +0100)
commit72901a4ed83c01fba6aaa11cc4904943f628d502
tree59ac0897e8649186b89d8fd1b3c2d40ff1aa2776
parentee8bcb2a5be4104db3d650a53ce951f5c3623e90
parent558d3ad4929f88834db60f2b2f25a8ae5e81ced4
Merge branch 'master' into background
src/gui/application.cpp
src/gui/main.cpp