diff options
author | Ramil Kalimullin <ramil@mysql.com> | 2010-11-18 15:01:50 +0300 |
---|---|---|
committer | Ramil Kalimullin <ramil@mysql.com> | 2010-11-18 15:01:50 +0300 |
commit | 3bae49d64ce0df04a85583b5dc680cda54760dbc (patch) | |
tree | 04b3b89fdd9cd8129c671253e6d65fe9be72ded2 /.bzrignore | |
parent | 52e88852697896b7fd150faf28c60a56cda42ab8 (diff) | |
parent | c45458524cae4b500d1d1f043060cfe3bb376d7e (diff) | |
download | mariadb-git-3bae49d64ce0df04a85583b5dc680cda54760dbc.tar.gz |
Manual-merge from 5.5-bugfixing.
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index a882c6a9adc..e420b1590d1 100644 --- a/.bzrignore +++ b/.bzrignore @@ -9,16 +9,20 @@ *.core *.d *.da +*.dll *.dylib *.exe +*.exp *.gcda *.gcno *.gcov *.idb +*.ilk *.la *.lai *.lib *.lo +*.manifest *.map *.o *.obj @@ -149,6 +153,7 @@ Makefile Makefile.in Makefile.in' PENDING/* +scripts/scripts TAGS VC++Files/client/mysql_amd64.dsp ac_available_languages_fragment @@ -1983,6 +1988,7 @@ sql-bench/test-transactions sql-bench/test-wisconsin sql/*.cpp sql/*.ds? +sql/*.def sql/*.vcproj sql/.deps/client.Po sql/.deps/derror.Po @@ -2118,6 +2124,7 @@ sql/.libs/udf_example.lai sql/.libs/udf_example.so.0 sql/.libs/udf_example.so.0.0.0 sql/client.c +sql/cmake_dummy.cc sql/Doxyfile sql/f.c sql/gen_lex_hash @@ -3048,6 +3055,7 @@ vio/viotest.cpp win/configure.data win/vs71cache.txt win/vs8cache.txt +win/nmake_cache.txt ylwrap zlib/*.ds? zlib/*.vcproj |