summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2015-04-08 20:51:18 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-04-08 20:51:19 +0000
commitc14e0a4ba827b52ec5c7460f8128b8ea0a10cce4 (patch)
tree1c97d3ca1eda7b0ba8812af5a0af237a644aef17
parentb471b0869bc4b0bbcc0dc3a15d3b12ab1b1c0a73 (diff)
parent47a4f5882dedd019141fbaf3c718898b75efbc39 (diff)
downloadandroid_packages_apps_Trebuchet-c14e0a4ba827b52ec5c7460f8128b8ea0a10cce4.tar.gz
android_packages_apps_Trebuchet-c14e0a4ba827b52ec5c7460f8128b8ea0a10cce4.tar.bz2
android_packages_apps_Trebuchet-c14e0a4ba827b52ec5c7460f8128b8ea0a10cce4.zip
Merge "update .gitignore config file so that we do not have to scroll through the unstaged items to pick which one to stage." into ub-launcher3-burnaby
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 4d5667e54..aea5d6102 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,9 @@ db_files
*.iml
.project
.classpath
+.project.properties
gen/
tests/stress/gen/
WallpaperPicker/gen/
+WallpaperPicker/.project.properties
+bin/