ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1625 from unknownbrackets/android-minor 

Android: Ignore some generated files
This commit is contained in:
Lioncash 2014-12-01 02:54:31 -05:00
parent 4946c6876d 43d48809c4
commit f9ba7a0fb2
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -8,6 +8,8 @@ Source/Core/Common/scmrev.h
/[Bb]uild*/ /[Bb]uild*/
/[Bb]inary/ /[Bb]inary/
/obj/ /obj/
# Android cmake builds to here then copies to Source/Android.
/libs/
# Ignore various files created by visual studio/msbuild # Ignore various files created by visual studio/msbuild
*.ipch *.ipch
*.opensdf *.opensdf

9
Source/Android/.gitignore vendored
View File

@ -9,8 +9,13 @@
*.class *.class
# generated files # generated files
bin/ /bin/
gen/ /gen/
/libs/
/obj/
# Copied by cmake
/assets/
# Local configuration file (sdk path, etc) # Local configuration file (sdk path, etc)
local.properties local.properties