diff options
| author | unknown <iggy@recycle.(none)> | 2007-04-23 15:47:26 -0400 |
|---|---|---|
| committer | unknown <iggy@recycle.(none)> | 2007-04-23 15:47:26 -0400 |
| commit | 917f89ceb693c4fbaa0d459007d70363db366d8c (patch) | |
| tree | a64d1799cee94446a7de6fa3cf71948194c5a611 /.bzrignore | |
| parent | 0d5a18b53bd30af029b27e39579b52f05b8f7115 (diff) | |
| parent | 1ce0d7c63b33bd7970b6ab53884e726858cee92d (diff) | |
| download | mariadb-git-917f89ceb693c4fbaa0d459007d70363db366d8c.tar.gz | |
Merge recycle.(none):/src/bug24732/my50-bug24732
into recycle.(none):/src/bug24732/my51-bug24732
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-CMakeLists.txt~1:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~10:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~13:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~2:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~7:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~c20dcd005f596740:
Auto merged
BitKeeper/deleted/.del-README~1:
Auto merged
BitKeeper/deleted/.del-configure.js:
Auto merged
Diffstat (limited to '.bzrignore')
| -rw-r--r-- | .bzrignore | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.bzrignore b/.bzrignore index 2e6193b6368..83d4a35c240 100644 --- a/.bzrignore +++ b/.bzrignore @@ -5,7 +5,6 @@ *.bb *.bbg *.bin -*.cmake *.core *.d *.da @@ -32,6 +31,7 @@ *.spec *.user *.vcproj +*.vcproj.cmake */*.dir/* */*_pure_*warnings */.deps @@ -394,6 +394,7 @@ client/tmp.diff client_debug/* client_release/* client_test +cmake_install.cmake cmd-line-utils/libedit/.deps/chared.Po cmd-line-utils/libedit/.deps/common.Po cmd-line-utils/libedit/.deps/el.Po |