diff options
author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-16 18:16:07 +0300 |
---|---|---|
committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-16 18:16:07 +0300 |
commit | 5564e0837f8d6811acd6f8dc0369ec96dcab3c54 (patch) | |
tree | 94f7517b9264a7af5ea2dd14b146c7e10860363b /sql/share | |
parent | 37da201f2fde90fc952b22a75eb34274ac2c3494 (diff) | |
parent | 32edab6bfe4fada3adbf8688375600c8f911c82c (diff) | |
download | mariadb-git-5564e0837f8d6811acd6f8dc0369ec96dcab3c54.tar.gz |
merged mysql-5.5 into WL1054-5.5
Diffstat (limited to 'sql/share')
-rw-r--r-- | sql/share/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/share/CMakeLists.txt b/sql/share/CMakeLists.txt index 14de851aaa2..f8fd51fda23 100644 --- a/sql/share/CMakeLists.txt +++ b/sql/share/CMakeLists.txt @@ -1,17 +1,17 @@ -# Copyright (C) 2009 Sun Microsystems, Inc +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA SET (dirs danish |