aboutsummaryrefslogtreecommitdiffstats
path: root/.gitmodules
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-03-03 22:44:37 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-03-03 22:44:37 +0100
commitb6e30e0bb2b8899edeb5305e50581522a55cb9e7 (patch)
treef2f826256185d7aa91ec37e5b161f878337b4f52 /.gitmodules
parent7b0e067f63f6f463cd7775347a7bf1c6e3c232c6 (diff)
parent568854f6dd0c25a0da30b1786161803ced1ec694 (diff)
downloadopen-keychain-b6e30e0bb2b8899edeb5305e50581522a55cb9e7.tar.gz
open-keychain-b6e30e0bb2b8899edeb5305e50581522a55cb9e7.tar.bz2
open-keychain-b6e30e0bb2b8899edeb5305e50581522a55cb9e7.zip
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules4
1 files changed, 3 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 8238c3f80..1577e4f83 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,9 +19,11 @@
[submodule "extern/minidns"]
path = extern/minidns
url = https://github.com/open-keychain/minidns.git
+ ignore = dirty
[submodule "extern/TokenAutoComplete"]
path = extern/TokenAutoComplete
url = https://github.com/open-keychain/TokenAutoComplete
[submodule "extern/safeslinger-exchange"]
path = extern/safeslinger-exchange
- url = https://github.com/open-keychain/exchange-android
+ url = https://github.com/open-keychain/exchange-android
+ ignore = dirty