vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Smack/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl
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
..
jmf Merge branch '4.1' 2015-03-24 17:16:18 +01:00
jspeex Add more checkstyle tests 2015-03-17 22:02:44 +01:00
multi 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
sshare Xlint all the things 2015-03-23 09:28:49 +01:00
test 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
JMFInit.java Xlint all the things 2015-03-23 09:28:49 +01:00