Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-12-23 04:57:58 +01:00
Code Issues Releases Wiki Activity
Smack/smack-jingle-old/src
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
..
demo/java/org/jivesoftware/smackx/jingle/mediaimpl/demo Add more checkstyle tests 2015-03-17 22:02:44 +01:00
integration-test Add more checkstyle tests 2015-03-17 22:02:44 +01:00
main/java/org/jivesoftware/smackx/jingleold Merge branch '4.1' 2015-03-24 17:16:18 +01:00