Merge branch 'develop' into glwidget-gtk3
authorJarl Gullberg <jarl.gullberg@gmail.com>
Tue, 30 May 2017 15:44:11 +0000 (17:44 +0200)
committerJarl Gullberg <jarl.gullberg@gmail.com>
Tue, 30 May 2017 15:44:11 +0000 (17:44 +0200)
commitd5e060d4e02c41cf4536a58ad68ca35ec9e68339
tree48cbe135dc348c10ccf73f0ec79aa12250aa51d3
parent5a5c85ab18dbfa0ae69c5aa0a1f4eac919f2107a
parentc05ac4f7a0bebaefa4a8945b16a0aeb02283e207
Merge branch 'develop' into glwidget-gtk3