diff options
author | Sergei Golubchik <sergii@pisem.net> | 2012-08-09 17:22:00 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2012-08-09 17:22:00 +0200 |
commit | d11829654c4ef5c3d0f997ca61a50d4bd196db8a (patch) | |
tree | e48a5775e961b17600bf9c1c189243deb5515ba7 /.bzrignore | |
parent | e022b6ef07529d83e8c1cbd5e3d374fc5cc75721 (diff) | |
parent | 704898bf3200af4da42c1bf9251a7da5533db73f (diff) | |
download | mariadb-git-d11829654c4ef5c3d0f997ca61a50d4bd196db8a.tar.gz |
merge with MySQL 5.5.27
manually checked every change, reverted incorrect or stupid changes.
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index 409b6148125..74c81c48e05 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1097,7 +1097,6 @@ CPackSourceConfig.cmake Docs/INFO_BIN Docs/INFO_SRC tags -sql/.empty Testing info_macros.cmake VERSION.dep |