Merge remote-tracking branch 'origin/5.2'

Authored by kfunk on Sep 14 2017, 6:25 PM.

Description

Merge remote-tracking branch 'origin/5.2'

Details

Committed
kfunkSep 14 2017, 6:25 PM
Parents
R32:c917ebbef901: Minor: Fix coding style
R32:54a8aa75f94e: Type Alias Template fix
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
54a8aa75f94eD7799craigt/apol
Type Alias Template fix 
Sep 14 2017
0c05bd55965fD7752apol
Make it possible for IBuildSystem to provide extra arguments to the parser 
Sep 14 2017