Diffusion Craft bb19ff30604c

Merge remote-tracking branch 'origin/2017.12'

Authored by vonreth on Dec 18 2017, 3:56 PM.

Description

Merge remote-tracking branch 'origin/2017.12'

Details

Committed
vonrethDec 18 2017, 3:56 PM
Parents
R138:56890f3ec7c6: Fix ignored
R138:47aff5b1fe43: Merge remote-tracking branch 'origin/2017.12'
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
56890f3ec7c6vonreth
Fix ignored 
Dec 18 2017