summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2016-10-06 17:31:12 +0000
committerSergei Petrunia <psergey@askmonty.org>2016-10-06 17:31:12 +0000
commitc680acd6a3fd43ea09b18a816881581b9da7c3c5 (patch)
treeccc968cac1e7dda8fea3952d3f89839bb8d90ee9 /.gitmodules
parent00fc86f1af81786b85f380bc03c03938552b60e6 (diff)
parentebfc4e6ad02b0cef34ec3f446007b98d85af9296 (diff)
downloadmariadb-git-c680acd6a3fd43ea09b18a816881581b9da7c3c5.tar.gz
Merge remote-tracking branch 'mergetrees/merge-myrocks' into bb-10.2-mariarocks
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions