diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:01:16 +0300 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-07 12:01:16 +0300 |
| commit | 7dd5e2235339401b44eda13b124f3482472539d4 (patch) | |
| tree | d7f1e6ad18a258e6467a75731ab44968fe005c9a /.gitignore | |
| parent | a2dcb579ff5d3565e7e6c6afe37878855361595b (diff) | |
| parent | d4612b5e173455a24adbae2bfd4654ae065556cc (diff) | |
| download | open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.tar.gz open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.tar.bz2 open-keychain-7dd5e2235339401b44eda13b124f3482472539d4.zip | |
Merge branch 'master' into backup-api
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
extern/openpgp-api-lib
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore index 68f5b5a9e..c7c85bfa0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,37 +1,28 @@ -#Android specific -bin -gen -obj -libs/armeabi +# Android specific lint.xml local.properties release.properties -ant.properties *.class *.apk -#Gradle +# Gradle .gradle build -gradle.properties -# this is in here because the prepare-tests thing modifies it, and we DON'T -# want this to be commited. use git add -f to work on this file. -settings.gradle -#Maven +# Maven target pom.xml.* -#Eclipse +# Eclipse .project .classpath .settings .metadata -#IntelliJ IDEA +# IntelliJ IDEA .idea *.iml -#OS Specific +# OS Specific [Tt]humbs.db .DS_Store |