vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-core/src/main
History
Florian Schmaus 1ed5c48bcc Merge branch '4.0' 
Conflicts:
	smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java
 		2014-07-16 10:52:58 +02:00
..
java/org/jivesoftware/smack Merge branch '4.0' 2014-07-16 10:52:58 +02:00
resources/org.jivesoftware.smack Reworked OSGi support of Smack (SMACK-343) 2014-05-15 16:09:37 +02:00