Diff - 239370b57a88fcf2ef507eea19da770fc165166f^1..239370b57a88fcf2ef507eea19da770fc165166f - gerrit - Git at Google

commit: 239370b57a88fcf2ef507eea19da770fc165166f
[log]
author: Edwin Kempin <ekempin@google.com>
Fri Apr 29 05:22:01 2016 +0000
committer: Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri Apr 29 05:22:01 2016 +0000
tree: 1c05a782d1f71b0d7b83bf19c4508b60e09d1157
parent: ebbeb4f759dba1e9abbf2d2b37db783f11e416d8 [diff]
parent: b156a5a19e41ab9c01111080ad76b3163ba83b21 [diff]

Merge "Added tmp files to gitignore"

diff --git a/.gitignore b/.gitignore
index 96b2a5c..d4ef1b8 100644
--- a/.gitignore
+++ b/.gitignore

@@ -24,3 +24,4 @@
 *.swp
 *.asc
 /bin/
+*~