diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2010-07-19 18:00:29 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2010-07-19 18:00:29 +0400 |
| commit | b5eac2b2cec6919a57adc5dbf6dae39ce5525eff (patch) | |
| tree | 6ba958e0b0ab253cbf6193e11f5e36bcbc694622 /strings | |
| parent | 917c33cfbf7feade67ae4d4d884870e8f96f822e (diff) | |
| parent | e875a1d66b83b758c34d2190ffd180bd626327ea (diff) | |
| download | mariadb-git-b5eac2b2cec6919a57adc5dbf6dae39ce5525eff.tar.gz | |
Manual merge from mysql-trunk.
Conflicts:
- scripts/CMakeLists.txt
Diffstat (limited to 'strings')
0 files changed, 0 insertions, 0 deletions