Merge branch 'develop' into glwidget-gtk3
authorJarl Gullberg <jarl.gullberg@gmail.com>
Thu, 8 Jun 2017 11:35:29 +0000 (13:35 +0200)
committerJarl Gullberg <jarl.gullberg@gmail.com>
Thu, 8 Jun 2017 11:35:29 +0000 (13:35 +0200)
commite78036818b7d468f7b801a5ae238d159403beda7
tree763729fb33e3123471d15bf07b6d64d919226a97
parentd5e060d4e02c41cf4536a58ad68ca35ec9e68339
parente3d324a9c59b4c34360e4cd375756cc88717cb91
Merge branch 'develop' into glwidget-gtk3