summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMatthias Leich <Matthias.Leich@sun.com>2009-03-30 16:21:30 +0200
committerMatthias Leich <Matthias.Leich@sun.com>2009-03-30 16:21:30 +0200
commit839279d0e6ac3751fc4889a33f7dccfa18650a58 (patch)
treecd3d12dcefef653df332557966eb6b043dad3b75 /scripts
parent594c617f5d6fb9503ede25224c7908c0fa53e745 (diff)
parentbb604da6dd674ef6c98cfdfd83b9ff06ac2992d6 (diff)
downloadmariadb-git-839279d0e6ac3751fc4889a33f7dccfa18650a58.tar.gz
AUtomatic merge, no conflicts, no modifications of files
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions