vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-extensions/src/main/resources/org.jivesoftware.smack.exte...
History
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
..
extensions.providers Add Support for XEP-80: User Location 2015-03-16 20:01:58 +01:00
extensions.xml Add EntityCapsManager to startup classes 2015-03-18 22:05:26 +01:00