mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-06-20 10:24:49 +02:00
Conflicts: smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java |
||
---|---|---|
.. | ||
Bind.java | ||
DefaultPacketExtension.java | ||
Element.java | ||
IQ.java | ||
Message.java | ||
package.html | ||
Packet.java | ||
PacketExtension.java | ||
Presence.java | ||
Registration.java | ||
RosterPacket.java | ||
Session.java | ||
StreamError.java | ||
XMPPError.java |