Merge branch '0.9'

Authored by sitter on Feb 23 2018, 1:05 PM.

Description

Merge branch '0.9'

  1. Conflicts:
  2. CMakeLists.txt

Details

Committed
sitterFeb 23 2018, 1:05 PM
Parents
R489:fcfd6405a36c: fix current audio track detection
R489:8f173f0942a3: bump to 0.9.1
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
8f173f0942a3sitter
bump to 0.9.1 
Feb 23 2017
3e86f5c95e57rjvbb
backport of 2 commits for Mac on master: 
Feb 20 2017

Empty Commit

This commit is empty and does not affect any paths.