Florian Schmaus
|
83b84c5bd3
|
Merge branch '4.1'
Conflicts:
smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java
smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java
smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
version.gradle
|
2015-03-24 17:16:18 +01:00 |
|
Florian Schmaus
|
5e86db4f80
|
Substitute 'packet' with 'stanza(/packet)' in javadoc
|
2015-03-21 09:36:28 +01:00 |
|
Florian Schmaus
|
5bb4727c57
|
Use Jid (and subclasses) from jxmpp-jid
Fixes SMACK-634
|
2015-02-17 16:07:16 +01:00 |
|
Florian Schmaus
|
bc61527bd2
|
Expose InterruptedException
SMACK-632
|
2015-02-14 14:57:33 +01:00 |
|
Florian Schmaus
|
f65c0d5528
|
Renamed smack-jingle to smack-jingle-old
Also renamed package name from
org.jivesoftware.smackx.jingle
to
org.jivesoftware.smackx.jingleold
|
2014-08-20 00:26:02 +02:00 |
|