summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDavi Arnaut <Davi.Arnaut@Sun.COM>2009-12-18 16:44:24 -0200
committerDavi Arnaut <Davi.Arnaut@Sun.COM>2009-12-18 16:44:24 -0200
commit61ae92889808c3c38c5e449e36fc30f89e8e3f23 (patch)
tree8cb3e4210dd5da0c3cec217f0e5008ee9104715b /include
parentf815246486444ca2dc5d408099439e1d973d3a7b (diff)
parent06a1df91813ea2c39f7312bcf8af972c7e8a926f (diff)
downloadmariadb-git-61ae92889808c3c38c5e449e36fc30f89e8e3f23.tar.gz
Manual merge.
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions