Diffusion KDb aee2a8d4c4ad

Merge remote-tracking branch 'origin/3.2'

Authored by staniek on Dec 13 2018, 1:55 PM.

Description

Merge remote-tracking branch 'origin/3.2'

  1. Conflicts:
  2. CMakeLists.txt

Details

Committed
staniekDec 13 2018, 1:55 PM
Parents
R15:7d4dad4efb18: Version 3.2.0
R15:fd5e573991be: Version 3.3.0 alpha
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
7d4dad4efb18D17336staniek
Version 3.2.0 
Dec 13 2018

Empty Commit

This commit is empty and does not affect any paths.