diff options
author | Alexander Barkov <bar@mysql.com> | 2011-01-19 16:31:17 +0300 |
---|---|---|
committer | Alexander Barkov <bar@mysql.com> | 2011-01-19 16:31:17 +0300 |
commit | dfb7930b33b4988705c1d4dac3e11e6eb63e7512 (patch) | |
tree | 90ad99404a9788532b9f7032c9301dbbebaab6e3 /strings/conf_to_src.c | |
parent | 359fe5ec6c02afb852e6953f742773c506acbcc7 (diff) | |
parent | 435289acd4b48e4e12c007f58cc317f4ea6a8ca7 (diff) | |
download | mariadb-git-dfb7930b33b4988705c1d4dac3e11e6eb63e7512.tar.gz |
Merging Copyright update from 5.1
Diffstat (limited to 'strings/conf_to_src.c')
-rw-r--r-- | strings/conf_to_src.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/strings/conf_to_src.c b/strings/conf_to_src.c index 73ade93f6e1..fce7f01d9ed 100644 --- a/strings/conf_to_src.c +++ b/strings/conf_to_src.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 MySQL AB +/* Copyright (c) 2000, 2011, 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 @@ -252,7 +252,7 @@ static void fprint_copyright(FILE *file) { fprintf(file, -"/* Copyright 2000-2008 MySQL AB, 2008 Sun Microsystems, Inc.\n" +"/* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.\n" "\n" " This program is free software; you can redistribute it and/or modify\n" " it under the terms of the GNU General Public License as published by\n" |