Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-12-02 03:02:08 +01:00
Code Issues Releases Wiki Activity
Smack/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons
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
..
packet Substitute 'packet' with 'stanza(/packet)' in javadoc 2015-03-21 09:36:28 +01:00
provider Merge branch '4.1' 2015-03-24 17:16:18 +01:00
CarbonManager.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00