diff options
author | unknown <joerg@trift2.> | 2007-08-02 20:19:21 +0200 |
---|---|---|
committer | unknown <joerg@trift2.> | 2007-08-02 20:19:21 +0200 |
commit | 638de07fd66eea28b4f50b2ca3a25ad6df718369 (patch) | |
tree | 960f9858efef288002af2321814733d81295db89 /tests | |
parent | 10f98395b3d1bd4072db8ebdab6e23af2a230b8c (diff) | |
parent | 8b2a02075b648c6bfe3b4a84ba1be0b0c06dbe94 (diff) | |
download | mariadb-git-638de07fd66eea28b4f50b2ca3a25ad6df718369.tar.gz |
Merge trift2.:/MySQL/M51/bug29982-5.1
into trift2.:/MySQL/M51/push-5.1
BitKeeper/deleted/.del-CMakeLists.txt~5b8836e4:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~fc201a06:
Auto merged
CMakeLists.txt:
Auto merged
tests/CMakeLists.txt:
Auto merged
Diffstat (limited to 'tests')
-rwxr-xr-x[-rw-r--r--] | tests/CMakeLists.txt | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7559ca9ec6b..7559ca9ec6b 100644..100755 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt |