Merge remote-tracking branch 'origin/2.0'

Authored by kfunk on Jan 5 2017, 9:13 PM.

Description

Merge remote-tracking branch 'origin/2.0'

Merged Changes

CommitAuthorDetailsCommitted
0a74d3a941efkfunk
CMake: Don't run into CMP0048 warning 
Jan 5 2017