diff options
author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-03-28 13:57:54 +0300 |
---|---|---|
committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2011-03-28 13:57:54 +0300 |
commit | 7dca4626fb842fa2f5b2d3eb72b2fb608c934970 (patch) | |
tree | 8a92672c663f91b40cfeb52671a8c886164ac628 /.bzrignore | |
parent | 5534b06d53731174ed1363a7ef0279363e27f7ad (diff) | |
parent | 9b7c15beae8edc2be87389c990f966776f258ca8 (diff) | |
download | mariadb-git-7dca4626fb842fa2f5b2d3eb72b2fb608c934970.tar.gz |
merge mysql-5.1->mysql-5.5
Diffstat (limited to '.bzrignore')
-rw-r--r-- | .bzrignore | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index ea2554de265..45cd7f2dc78 100644 --- a/.bzrignore +++ b/.bzrignore @@ -9,6 +9,7 @@ *.core *.d *.da +*.dir *.dll *.dylib *.exe @@ -31,6 +32,7 @@ *.pdb *.reject *.res +*.rule *.sbr *.so *.so.* @@ -38,6 +40,8 @@ *.user *.vcproj *.vcproj.cmake +*.vcxproj +*.vcxproj.filters */*.dir/* */*_pure_*warnings */.deps @@ -46,7 +50,7 @@ */debug/* */minsizerel/* */release/* -*/relwithdebinfo/* +RelWithDebInfo *~ .*.swp ./CMakeCache.txt |