mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-06-18 09: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 |
||
---|---|---|
.. | ||
amp | ||
bytestreams | ||
caps | ||
delay/provider | ||
filetransfer | ||
forward | ||
iqlast | ||
iqversion | ||
jiveproperties | ||
muc | ||
ping | ||
privacy/provider | ||
pubsub | ||
receipts | ||
time/packet | ||
xhtmlim/provider | ||
ExtensionsInitializerTest.java | ||
InitExtensions.java | ||
VCardUnitTest.java |