From 2dac11d04415447178afedefcd5e71f3673695b7 Mon Sep 17 00:00:00 2001
From: marynate <mary.w.nate@gmail.com>
Date: Sat, 15 Feb 2014 19:34:21 +0800
Subject: [PATCH] More gitignore

---
 .gitignore | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index b9f3f80af40..c3af3222940 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,12 +13,24 @@ modules/register_module_types.cpp
 core/version.h
 core/method_bind.inc
 core/global_defaults.cpp
+tools/editor/register_exporters.cpp
+-fpic
+
+# Android specific
+platform/android/java/local.properties
 platform/android/java/project.properties
 platform/android/java/AndroidManifest.xml
-tools/editor/register_exporters.cpp
+platform/android/java/bin/
+platform/android/java/gen/
+platform/android/java/assets
 
 # General c++ generated files
 *.lib
+*.o
+*.a
+*.d
+*.so
+*.os
 
 # QT project files
 *.config
@@ -26,6 +38,8 @@ tools/editor/register_exporters.cpp
 *.files
 *.includes
 
+# Misc
+.DS_Store
 
 # for projects that use SCons for building: http://http://www.scons.org/
 .sconsign.dblite
@@ -216,4 +230,4 @@ ehthumbs.db
 Desktop.ini
 
 # Recycle Bin used on file shares
-$RECYCLE.BIN/
\ No newline at end of file
+$RECYCLE.BIN/