diff options
| author | Sam Whited <sam@samwhited.com> | 2014-10-30 15:20:20 -0400 |
|---|---|---|
| committer | Sam Whited <sam@samwhited.com> | 2014-10-30 15:33:13 -0400 |
| commit | 46f147a82c6b161e071f717c7686f8b78a20aaf1 (patch) | |
| tree | 38ee04006e38197fd8009697b8975007ec0f45c8 /src/main/java/eu/siacs/conversations/persistance | |
| parent | 142384e5805d93887d185c9a5b74d4850e4ec719 (diff) | |
| parent | a362bd10214b16f8939c12a1dd4376667fe0d49f (diff) | |
Merge branch 'gradle' into development
Conflicts:
.gitignore
CHANGELOG.md
README.md
libs/MemorizingTrustManager
libs/minidns
libs/openpgp-api-lib
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java (renamed from src/eu/siacs/conversations/persistance/DatabaseBackend.java) | 0 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/persistance/FileBackend.java (renamed from src/eu/siacs/conversations/persistance/FileBackend.java) | 0 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java (renamed from src/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java) | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/src/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java index 12e5e251..12e5e251 100644 --- a/src/eu/siacs/conversations/persistance/DatabaseBackend.java +++ b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java diff --git a/src/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java index 13daa27b..13daa27b 100644 --- a/src/eu/siacs/conversations/persistance/FileBackend.java +++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java diff --git a/src/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java b/src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java index 6a457b17..6a457b17 100644 --- a/src/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java +++ b/src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java |