diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-06-13 16:10:25 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-06-13 16:10:25 +0200 |
| commit | f61f36b386e8d0c6448297bb84c92e8d9b82be6a (patch) | |
| tree | 6248b04e9a41d2df2270ead15d62afde7f57aa69 /.gitignore | |
| parent | 2caeda442502b5ea2583a0ce15107d171e06dfcd (diff) | |
| parent | 55b010233a2d897ac8bc7aee0f136f2794814455 (diff) | |
| download | mariadb-git-f61f36b386e8d0c6448297bb84c92e8d9b82be6a.tar.gz | |
Merge branch '10.0' into 10.1
Conflicts:
CMakeLists.txt
VERSION
Modified:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 77c5ae0538e..6e1c180d168 100644 --- a/.gitignore +++ b/.gitignore @@ -76,8 +76,10 @@ packaging/solaris/postinstall-solaris pcre/config.h pcre/pcre*test.sh pcre/pcre.h +pcre/pcre_chartables.c pcre/pcregrep pcre/pcretest +pcre/test*grep scripts/comp_sql scripts/make_binary_distribution scripts/msql2mysql |