Merge branch 'master' of github.com:franklinharper/AOC-France.git

franklinharper · May 1, 2012 · bf6f603 · bf6f603
2 parents 5c6a776 + d501cc9
commit bf6f603
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,5 @@
 /gen/
-/bin/
+/bin/
+/local.properties
+/wineapps.keystore
+
diff --git a/ant.properties b/ant.properties
@@ -14,4 +14,5 @@
 #  'key.store' for the location of your keystore and
 #  'key.alias' for the name of the key to use.
 # The password will be asked during the build when you use the 'release' target.
-
+key.store = wineapps.keystore
+key.alias = franceaoc
diff --git a/build.properties b/build.properties
diff --git a/local.properties b/local.properties