diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-10-07 00:18:30 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-10-07 00:18:30 +0200 |
| commit | eeca1f8694ccd0a8271d10e73c628b4a062ed9a5 (patch) | |
| tree | bdc3aa6c3bc64c0e737a8b1298895fbe9f8d6b5b /.bzrignore | |
| parent | 9c32088322f69155d91f6033319ebb03d108f044 (diff) | |
| parent | 4a4aa358f39c85fef7486a857abde11615544f71 (diff) | |
| download | mariadb-git-eeca1f8694ccd0a8271d10e73c628b4a062ed9a5.tar.gz | |
merge with 5.1
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index 6b18d09723b..be6b6d47d31 100644 --- a/.bzrignore +++ b/.bzrignore @@ -699,7 +699,6 @@ ma_test_recovery.output man/*.1 maria-win.patch maria_log.00000* -maria_log_control merge/*.ds? merge/*.vcproj missing @@ -1961,3 +1960,8 @@ client/strings_def.h libmysql/strings_def.h libmysql_r/strings_def.h storage/maria/aria_log_control +CPackConfig.cmake +CPackSourceConfig.cmake +win/nmake_cache.txt +*.manifest +*.resource.txt |