| commit | 0d09a8d608f6e74549c6330e564ee871953ad688 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Fri Jan 24 12:40:25 2020 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Fri Jan 24 12:40:25 2020 +0900 |
| tree | 841e58bd9da50a6c7b1c84ce4733e95b30a062ba | |
| parent | 710b6c686c8e6f981446c45ba0e1e3b3b2e4cd2c [diff] | |
| parent | 22c82e5e7155c45efb17cc5ad6b268baaee84667 [diff] |
Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Add .apt_generated to .gitignore Change-Id: Icdd96889f87155974f48d286ef590f26f698266e
diff --git a/.gitignore b/.gitignore index b470f50..f47d0cd 100644 --- a/.gitignore +++ b/.gitignore
@@ -1,3 +1,4 @@ +/.apt_generated /.classpath /.idea /.primary_build_tool