diff options
| author | Monty <monty@mariadb.org> | 2016-02-02 13:07:53 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-02-02 13:07:53 +0200 |
| commit | 11c2d3c3e21642107db625f33c177f09d8ccd3ca (patch) | |
| tree | 086455d9163bae04ea602247aaa710204b48b4e9 /configure.cmake | |
| parent | 52d695fef4f959daf12cc1e4b83907917dddfbe8 (diff) | |
| parent | 5cf293fcad0dd78c4e1a797ed1f68fb2cf165b14 (diff) | |
| download | mariadb-git-11c2d3c3e21642107db625f33c177f09d8ccd3ca.tar.gz | |
Merge branch '10.0' into 10.1
Conflicts:
configure.cmake
Diffstat (limited to 'configure.cmake')
| -rw-r--r-- | configure.cmake | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configure.cmake b/configure.cmake index d59029df14a..203f49c1a0d 100644 --- a/configure.cmake +++ b/configure.cmake @@ -1091,4 +1091,3 @@ IF(NOT MSVC) HAVE_FALLOC_PUNCH_HOLE_AND_KEEP_SIZE ) ENDIF() - |