summaryrefslogtreecommitdiff
path: root/.bzrignore
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-10-11 12:55:42 +0200
committerSergei Golubchik <sergii@pisem.net>2011-10-11 12:55:42 +0200
commitae6330080102f31edd6cd3b49028f0f3e39be769 (patch)
treeb277d27fcc4f0471c86fd0b756f120718b8d759a /.bzrignore
parent8feff690b6d1f09acb6a68315669e75924da5f80 (diff)
parent3e8731dee04ec5f47557e0a0f55aa5f6f8d1f698 (diff)
downloadmariadb-git-ae6330080102f31edd6cd3b49028f0f3e39be769.tar.gz
merge
Diffstat (limited to '.bzrignore')
-rw-r--r--.bzrignore6
1 files changed, 5 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore
index 720918c46a8..8ce761624b8 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -702,7 +702,6 @@ ma_test_recovery.output
man/*.1
maria-win.patch
maria_log.00000*
-maria_log_control
merge/*.ds?
merge/*.vcproj
missing
@@ -1971,3 +1970,8 @@ libmysql/strings_def.h
libmysql_r/strings_def.h
storage/maria/aria_log_control
scripts/mytop
+CPackConfig.cmake
+CPackSourceConfig.cmake
+win/nmake_cache.txt
+*.manifest
+*.resource.txt