summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorokamstudio <juan@okamstudio.com>2014-02-20 23:55:36 -0200
committerokamstudio <juan@okamstudio.com>2014-02-20 23:55:36 -0200
commit06eb1a3681735026bb35d62572944bff9aab4bf8 (patch)
treec8d761945e2d11b1e4023947a8d1317024cf371e
parent0c44adc51fbf802f307f36b31d528f25eef7e21f (diff)
parent2dac11d04415447178afedefcd5e71f3673695b7 (diff)
Merge pull request #88 from marynate/PR-More_gitignore
More gitignore
-rw-r--r--.gitignore18
1 files changed, 16 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index b9f3f80af4..c3af322294 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/