Merge remote-tracking branch 'remotes/upstream/sortInUploadFilesActivity' into beta
[pub/Android/ownCloud.git] / .gitignore
1 # built application files
2 *.ap_
3
4 # files for the dex VM
5 *.dex
6
7 # Java class files
8 *.class
9
10 # generated files
11 bin/
12 build/
13 *.iml
14 gen/
15 target/
16
17 # Local configuration files (sdk path, etc)
18 local.properties
19 oc_workaround/local.properties
20 oc_framework/local.properties
21 oc_framework-test-project/local.properties
22 tests/local.properties
23
24 # Mac .DS_Store files
25 .DS_Store
26
27 # Proguard README
28 proguard-project.txt
29 oc_workaround/proguard-project.txt
30 oc_framework/proguard-project.txt
31 oc_framework-test-project/proguard-project.txt
32 tests/proguard-project.txt
33
34 # Android Studio and Gradle specific entries
35 .gradle
36 .idea
37 *.iml
38 build
39
40 # Actionbarsherlock is now ignored since scripts takes care of init the sub-modules.
41 actionbarsherlock