Merge branch 'develop' into glwidget-gtk3
authorJarl Gullberg <jarl.gullberg@gmail.com>
Tue, 13 Jun 2017 18:29:58 +0000 (20:29 +0200)
committerJarl Gullberg <jarl.gullberg@gmail.com>
Tue, 13 Jun 2017 18:29:58 +0000 (20:29 +0200)
commit993d1a60c9ed509ee4c84405cc14b0a72935be6b
tree9165d5a0c125ecd13b09c106fb26d1bf8c4f88cb
parentfc954ef09b40c744302f24a88129c8c56c05e382
parent1e73f38ecd172be9c25238619031ba03f34698bb
Merge branch 'develop' into glwidget-gtk3