Permalink
Browse files

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

  • Loading branch information...
2 parents 5c6a776 + d501cc9 commit bf6f603d7399db96b4400c0cd74ebfd3a3d2d41d @pierrelevy pierrelevy committed May 1, 2012
Showing with 6 additions and 12 deletions.
  1. +4 −1 .gitignore
  2. +2 −1 ant.properties
  3. 0 build.properties
  4. +0 −10 local.properties
View
@@ -1,2 +1,5 @@
/gen/
-/bin/
+/bin/
+/local.properties
+/wineapps.keystore
+
View
@@ -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
View
No changes.
View
@@ -1,10 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must *NOT* be checked in Version Control Systems,
-# as it contains information specific to your local configuration.
-
-# location of the SDK. This is only used by Ant
-# For customization when using a Version Control System, please read the
-# header note.
-sdk.dir=/home/pierre/java/libs/android-sdk-linux_x86

0 comments on commit bf6f603

Please sign in to comment.