vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2024-06-17 00:44:50 +02:00
Code Issues Releases Wiki Activity
Smack/smack-extensions/src/main/java/org/jivesoftware
History
Florian Schmaus 34bc13bec7 Merge branch '4.0' 
Conflicts:
	build.gradle
	smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java
	smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java
	smack-core/src/main/java/org/jivesoftware/smack/util/PacketParserUtils.java
	smack-core/src/main/java/org/jivesoftware/smack/util/StringUtils.java
	smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java
2014-09-05 22:11:35 +02:00
..
smack/initializer/extensions Reworked OSGi support of Smack (SMACK-343) 2014-05-15 16:09:37 +02:00
smackx Merge branch '4.0' 2014-09-05 22:11:35 +02:00