diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-04 07:59:25 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-04 07:59:25 +0300 |
| commit | 6e105d75351dfcfd103c7b60838e59f1fd6b4749 (patch) | |
| tree | 89d49783fbf16fdfc3e82a8b19a995bfeacda018 /.gitignore | |
| parent | 00ab154d49853e20f48a516897e14bf67c58671e (diff) | |
| parent | 9505c9683930290c1e028043940ae8512a6ca040 (diff) | |
| download | mariadb-git-6e105d75351dfcfd103c7b60838e59f1fd6b4749.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 9fd9637d7ef..5e0a69e0491 100644 --- a/.gitignore +++ b/.gitignore @@ -97,6 +97,9 @@ pcre/pcre_chartables.c pcre/pcregrep pcre/pcretest pcre/test*grep +plugin/aws_key_management/aws-sdk-cpp +plugin/aws_key_management/aws_sdk_cpp +plugin/aws_key_management/aws_sdk_cpp-prefix scripts/comp_sql scripts/make_binary_distribution scripts/msql2mysql |