merge

2a6e34f2 · Mattias Jonsson · a2f39d9d · 74efe8c3 · 2a6e34f2
Commit 2a6e34f2 authored Jan 28, 2011 by Mattias Jonsson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/item_timefunc.h sql/item_timefunc.h +1 -1

No files found.
--- a/sql/item_timefunc.h
+++ b/sql/item_timefunc.h
 #ifndef ITEM_TIMEFUNC_INCLUDED
 #define ITEM_TIMEFUNC_INCLUDED
-/* Copyright (c) 2000, 2011 Oracle and/or its affiliates. All rights reserved.
+/* 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