From 4001623d7d2062e6b10ec7a66a7f3741e6dcc7b1 Mon Sep 17 00:00:00 2001 From: Alexander Lucas Date: Tue, 26 Apr 2011 14:46:58 -0700 Subject: [PATCH 1/2] Added local properties, updated how generated files are detected, added OS Cruft (useless stuff added by windows/mac) --- Android.gitignore | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Android.gitignore b/Android.gitignore index ca5523c0..526c4988 100644 --- a/Android.gitignore +++ b/Android.gitignore @@ -1,3 +1,8 @@ +# OS Cruft +.DS_Store +Thumbs.db +Desktop.ini + # built application files *.apk *.ap_ @@ -8,5 +13,9 @@ # Java class files *.class -# generated GUI files -*R.java +# generated files +bin/ +gen/ + +# Local configuration file (sdk path, etc) +local.properties From 599a7fc761ddd673bb097d6ada6d5c8736be4076 Mon Sep 17 00:00:00 2001 From: Alexander Lucas Date: Wed, 27 Apr 2011 13:12:44 -0700 Subject: [PATCH 2/2] Updated Generated Files location (*R was kind of dangerous), added local.properties --- Android.gitignore | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Android.gitignore b/Android.gitignore index 526c4988..d3f5d3e1 100644 --- a/Android.gitignore +++ b/Android.gitignore @@ -1,8 +1,3 @@ -# OS Cruft -.DS_Store -Thumbs.db -Desktop.ini - # built application files *.apk *.ap_