diff options
| author | Rene Treffer <treffer@measite.de> | 2014-07-23 22:49:36 +0200 |
|---|---|---|
| committer | Rene Treffer <treffer@measite.de> | 2014-07-23 22:49:36 +0200 |
| commit | 1665f2e1b3869f89e720051843812ba691d1ee8c (patch) | |
| tree | 16f74c9c90dfea232a4d17e56bdb934d6b8c1506 /libs/MemorizingTrustManager/example/res/layout/mtmexample.xml | |
| parent | bfcba9169d106fb082857e0ba4eaef7ee3df0782 (diff) | |
| parent | 2bddcc9f997e5b1e565478e99c55488c86a85e76 (diff) | |
Merge branch 'v0.1'
Conflicts:
src/main/java/de/measite/minidns/Record.java
Diffstat (limited to 'libs/MemorizingTrustManager/example/res/layout/mtmexample.xml')
0 files changed, 0 insertions, 0 deletions