diff options
| author | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-09-13 14:16:53 -0400 |
|---|---|---|
| committer | unknown <iggy@rolltop.ignatz42.dyndns.org> | 2006-09-13 14:16:53 -0400 |
| commit | 198b266ab2a1699d1577c8cfe7f82c44b6a05403 (patch) | |
| tree | 0447ebc8db0ea8be26c4c56704a1c2cc00219901 /.bzrignore | |
| parent | 3505bee96150d2b8574015f765a287d9e2f8774e (diff) | |
| parent | e90f2c4ff57a52920f44d534796dca7dc45597b7 (diff) | |
| download | mariadb-git-198b266ab2a1699d1577c8cfe7f82c44b6a05403.tar.gz | |
Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my50-winbkfix
into rolltop.ignatz42.dyndns.org:/mnt/storeage/winbkfix/my51-winbkfix
BitKeeper/etc/ignore:
auto-union
BitKeeper/triggers/post-commit:
Manual merge. Opted for the method that uses temp files for improved troubleshooting.
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/.bzrignore b/.bzrignore index 375fe14b9ad..db21a434335 100644 --- a/.bzrignore +++ b/.bzrignore @@ -5,6 +5,7 @@ *.bb *.bbg *.bin +*.cmake *.core *.d *.da @@ -20,6 +21,7 @@ *.map *.o *.obj +*.old *.pch *.pdb *.reject @@ -28,11 +30,21 @@ *.so *.so.* *.spec +*.user +*.vcproj +*/*.dir/* */*_pure_*warnings */.pure +*/debug/* +*/release/* *~ .*.swp +./CMakeCache.txt +./MySql.ncb +./MySql.sln +./MySql.suo ./README.build-files +./cmakecache.txt ./config.h ./copy_mysql_files.bat ./fix-project-files @@ -68,6 +80,7 @@ BitKeeper/post-commit-manual BitKeeper/tmp/* BitKeeper/tmp/bkr3sAHD BitKeeper/tmp/gone +CMakeFiles/* COPYING COPYING.LIB Docs/#manual.texi# @@ -1685,6 +1698,7 @@ strings/ctype_autoconf.c strings/ctype_extra_sources.c strings/str_test strings/test_decimal +support-files/*.ini support-files/MacOSX/Description.plist support-files/MacOSX/Info.plist support-files/MacOSX/ReadMe.txt @@ -1791,5 +1805,8 @@ vio/test-sslserver vio/viotest-ssl vio/viotest-sslconnect.cpp vio/viotest.cpp +win/configure.data +win/vs71cache.txt +win/vs8cache.txt zlib/*.ds? zlib/*.vcproj |