1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Merge branch '5.5' into 10.0

This commit is contained in:
Sergei Golubchik
2017-04-21 18:34:06 +02:00
57 changed files with 670 additions and 173 deletions

View File

@ -1,5 +1,5 @@
# Copyright (c) 2005, 2015, Oracle and/or its affiliates.
# Copyright (c) 2008, 2016, MariaDB
# Copyright (c) 2008, 2017, MariaDB
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public
@ -1386,4 +1386,3 @@
obj:*/libssl.so.0.9.8
...
}