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/xmpp/stanzas | |
| 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/xmpp/stanzas/AbstractStanza.java (renamed from src/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java) | 0 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java (renamed from src/eu/siacs/conversations/xmpp/stanzas/IqPacket.java) | 0 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java (renamed from src/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java) | 0 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java (renamed from src/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java) | 0 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java (renamed from src/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java) | 0 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java (renamed from src/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java) | 0 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java (renamed from src/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java) | 0 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java (renamed from src/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java) | 0 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java (renamed from src/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java) | 0 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java (renamed from src/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java) | 0 |
10 files changed, 0 insertions, 0 deletions
diff --git a/src/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java index eef41c791..eef41c791 100644 --- a/src/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java diff --git a/src/eu/siacs/conversations/xmpp/stanzas/IqPacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java index 9df05e678..9df05e678 100644 --- a/src/eu/siacs/conversations/xmpp/stanzas/IqPacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java diff --git a/src/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java index 4e7b532bf..4e7b532bf 100644 --- a/src/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java diff --git a/src/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java index 7ea320995..7ea320995 100644 --- a/src/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java diff --git a/src/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java index 78ab66d8f..78ab66d8f 100644 --- a/src/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java diff --git a/src/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java index f109280f1..f109280f1 100644 --- a/src/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java diff --git a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java index f93b5d870..f93b5d870 100644 --- a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java diff --git a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java index 78cd81edc..78cd81edc 100644 --- a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java diff --git a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java index 98cfc748b..98cfc748b 100644 --- a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java diff --git a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java index 9cdcfa5ec..9cdcfa5ec 100644 --- a/src/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java +++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java |