aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authordhewg2011-02-18 17:18:27 +0100
committerdhewg2011-02-18 17:18:27 +0100
commit8cddb2a401f7604bc7ffa7d7dfcafbc90cf2bada (patch)
tree22420998f87d8958dbbeeb75789d0ab6de8e5a67 /.gitignore
parent8a5078966290a3fbc0ee78d662cafa66a910b029 (diff)
parent2586e15e4ea6a365eced1888759630907b6b5870 (diff)
downloadscummvm-rg350-8cddb2a401f7604bc7ffa7d7dfcafbc90cf2bada.tar.gz
scummvm-rg350-8cddb2a401f7604bc7ffa7d7dfcafbc90cf2bada.tar.bz2
scummvm-rg350-8cddb2a401f7604bc7ffa7d7dfcafbc90cf2bada.zip
Merge branch 'dhewg-android'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 1 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 0b302073ae..6e3e61134c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,9 +22,6 @@ lib*.a
/.project
/.cproject
-/backends/platform/android/org/inodes/gus/scummvm/R.java
-/backends/platform/android/org/inodes/gus/scummvm/Manifest.java
-
/backends/platform/dc/gui
/backends/platform/dc/graphics
/backends/platform/dc/sound
@@ -143,4 +140,4 @@ ipch/
#Ignore default Visual Studio build folders
[Dd]ebug/
-[Rr]elease/ \ No newline at end of file
+[Rr]elease/