Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altosdroid / .gitignore

diff --git a/altosdroid/.gitignore b/altosdroid/.gitignore
index 7f0858eafbaefc752503fb6f4e89da24ca3ac5cc..cf7ad5a8bea9e5c8321dee3b62fb4740450b9353 100644 (file)
--- a/altosdroid/.gitignore
+++ b/altosdroid/.gitignore
@@ -5,3 +5,4 @@ libs
 google-play-services_lib
 src/org/altusmetrum/AltosDroid/BuildInfo.java
 res/drawable/*led.png
+AndroidManifest.xml