summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorreduz <reduzio@gmail.com>2014-06-17 11:56:16 -0300
committerreduz <reduzio@gmail.com>2014-06-17 11:56:16 -0300
commit155028612bfe26c7c8460f6acc28de6d385a3625 (patch)
tree15e0c14cdc6d3dffff84ea7632cc423bf4493a28
parent6cb3c94b035e4a8dcd34718e12ccd501b2631ced (diff)
parent1378c49a2e4d94f7feaeaa7787ab960e9029e57b (diff)
Merge pull request #508 from marynate/PR-more-gitignore
More gitignore
-rw-r--r--.gitignore12
1 files changed, 10 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 32c7fe51c1..45bf531311 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ drivers/gles2/shaders/*.h
modules/register_module_types.cpp
core/version.h
core/method_bind.inc
+core/script_encryption_key.cpp
core/global_defaults.cpp
tools/editor/register_exporters.cpp
tools/editor/doc_data_compressed.h
@@ -22,9 +23,16 @@ tools/editor/editor_icons.cpp
platform/android/java/local.properties
platform/android/java/project.properties
platform/android/java/AndroidManifest.xml
-platform/android/java/bin/
-platform/android/java/gen/
+platform/android/java/bin/*
+platform/android/java/libs/*
+platform/android/java/gen/*
platform/android/java/assets
+platform/android/libs/apk_expansion/bin/*
+platform/android/libs/apk_expansion/gen/*
+platform/android/libs/google_play_services/bin/*
+platform/android/libs/google_play_services/gen/*
+platform/android/libs/play_licensing/bin/*
+platform/android/libs/play_licensing/gen/*
# General c++ generated files
*.lib