Diffusion Elisa 96bebb9802b7

Merge branch 'master' into file_browser

Authored by mgallien on May 30 2018, 5:23 AM.

Description

Merge branch 'master' into file_browser

Merged Changes

CommitAuthorDetailsCommitted
ffc5e2ceb24cmgallien
fix some small annoyances with the NavigationActionBar 
May 30 2018
ec8810fd2d6amgallien
ensure we get the proper qt quick controls 2 style 
May 30 2018
143347526272D12842januz
Tweak size and color of handles for the seek/volume sliders 
May 30 2018