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

[tripe-android] / .gitignore

diff --git a/.gitignore b/.gitignore
index cdb06a1..7778fc4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,6 @@
 /cls/
-*.d
-*.o
-*.so
-*.stamp
 /out/
 /COPYING
 /auto-version
+debug.keystore
+/local.mk