Merge branch '3.1'
- Conflicts:
- CMakeLists.txt
staniek | Mar 19 2018, 11:22 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
946758016d2e | staniek | Improve MariaDB detection on Windows builds, separately from MySQL | Mar 19 2018 | |||
faeebbd67ff1 | staniek | GIT_SILENT Version 3.1.0 | Mar 6 2018 |