| commit | 22c82e5e7155c45efb17cc5ad6b268baaee84667 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Fri Jan 24 12:38:43 2020 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Fri Jan 24 12:38:43 2020 +0900 |
| tree | 168cdafa0cfbace23f008dc1f77ddaea94bb009e | |
| parent | 3903bea5b80687537a5bf64181f9f7b5159eb1b4 [diff] | |
| parent | 2d0888c889f916bb2f0983b7ab7aa6f5b1dc0d51 [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Add .apt_generated to .gitignore Change-Id: I4454d38a997049f6d215d04cece3baa973b03eb0
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