Merge remote-tracking branch 'origin/2.1'

Authored by aacid on Aug 13 2019, 10:23 PM.

Description

Merge remote-tracking branch 'origin/2.1'

Details

Committed
aacidAug 13 2019, 10:23 PM
Parents
R472:2ec2afe96f17: Mark override functions as such
R472:be8433b0f3b4: Merge branch '2.1'
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
2ec2afe96f17aacid
Mark override functions as such 
Aug 13 2019