diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-09-22 00:58:21 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-09-22 02:27:00 +0200 |
| commit | f1ce69f3a9c01877c588c28eab9484fba8cd0e56 (patch) | |
| tree | 38e09211de3288dc660ebc5a40159cb9720d3ba7 /cmake | |
| parent | 3fbd4aa03208833001296e63847c7922ff0bdd8b (diff) | |
| parent | f8a800bec81983910a96a5dc38f3aeb9b7528bce (diff) | |
| download | mariadb-git-f1ce69f3a9c01877c588c28eab9484fba8cd0e56.tar.gz | |
Merge branch '10.1' into 10.2
But without f4f48e06215..f8a800bec81 - fixes for MDEV-12672
and related issues. 10.2 specific fix follows...
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLis.txt | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/cmake/CMakeLis.txt b/cmake/CMakeLis.txt deleted file mode 100644 index e69de29bb2d..00000000000 --- a/cmake/CMakeLis.txt +++ /dev/null |