summaryrefslogtreecommitdiff
path: root/zlib
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-02-02 13:00:15 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-02-02 13:00:15 +0200
commit213ece2f2e8c23ee0e727cc02dcecfae6f510ca2 (patch)
tree5ce93ecb5caa9a58ebc08f8cd3e94c59d7219377 /zlib
parentc1e1764fc4b913ee688b383aac2698b83661d64c (diff)
parentd9d83f1d92b696ef56f4944df036b8a78364ebb4 (diff)
downloadmariadb-git-213ece2f2e8c23ee0e727cc02dcecfae6f510ca2.tar.gz
Merge 10.1 into 10.1
This is joint work with Oleksandr Byelkin.
Diffstat (limited to 'zlib')
0 files changed, 0 insertions, 0 deletions