Merge branch '1912'

Authored by mardelle on Nov 13 2019, 6:23 PM.

Description

Merge branch '1912'

Details

Committed
mardelleNov 13 2019, 6:23 PM
Parents
R158:0adfcd2167e6: Fix compilation
R158:131673816996: Merge branch '1912'
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
0adfcd2167e6mardelle
Fix compilation 
Nov 13 2019