1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-25 21:04:50 +02:00
Smack/smack-tcp/src/main/java/org/jivesoftware/smack/tcp
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
..
BundleAndDefer.java Minor javadoc fixes and improvements 2015-02-22 10:41:53 +01:00
BundleAndDeferCallback.java Improve the bundle and defer mechanism 2015-02-22 10:51:44 +01:00
TCPInitializer.java Enable OSGi compliance via 'DynamicImport-Package: *' 2015-01-03 13:14:02 +01:00
XMPPTCPConnection.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
XMPPTCPConnectionConfiguration.java Add javadoc to XMPPTCPConnectionConfiguration 2015-01-17 10:34:37 +01:00