keys.scala, etc.: Make merging public keys have a progress bar.

[tripe-android] / .gitignore

diff --git a/.gitignore b/.gitignore
index e3dc5e6..7778fc4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /COPYING
 /auto-version
 debug.keystore
+/local.mk