10.0-base merge

This commit is contained in:
Sergei Golubchik 2014-02-26 15:28:07 +01:00
commit 0dc23679c8
1449 changed files with 6137 additions and 2205 deletions

View file

@ -1,7 +1,7 @@
#ifndef ITEM_CMPFUNC_INCLUDED
#define ITEM_CMPFUNC_INCLUDED
/* Copyright (c) 2000, 2012, Oracle and/or its affiliates.
Copyright (c) 2009, 2011, Monty Program Ab
Copyright (c) 2009, 2011, Monty Program Ab.
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