Smack/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat
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
..
BasicResolver.java Add more checkstyle tests 2015-03-17 22:02:44 +01:00
BasicTransportManager.java Renamed smack-jingle to smack-jingle-old 2014-08-20 00:26:02 +02:00
BridgedResolver.java Add more checkstyle tests 2015-03-17 22:02:44 +01:00
BridgedTransportManager.java Expose InterruptedException 2015-02-14 14:57:33 +01:00
DatagramListener.java Substitute 'packet' with 'stanza(/packet)' in javadoc 2015-03-21 09:36:28 +01:00
FixedResolver.java Expose InterruptedException 2015-02-14 14:57:33 +01:00
FixedTransportManager.java 's;^\s+$;;' on all source files 2015-03-17 11:33:02 +01:00
HttpServer.java Add more checkstyle tests 2015-03-17 22:02:44 +01:00
ICECandidate.java Add more checkstyle tests 2015-03-17 22:02:44 +01:00
ICEResolver.java Add more checkstyle tests 2015-03-17 22:02:44 +01:00
ICETransportManager.java Add more checkstyle tests 2015-03-17 22:02:44 +01:00
JingleTransportManager.java Expose InterruptedException 2015-02-14 14:57:33 +01:00
RTPBridge.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
ResultListener.java Renamed smack-jingle to smack-jingle-old 2014-08-20 00:26:02 +02:00
STUN.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
STUNResolver.java Expose InterruptedException 2015-02-14 14:57:33 +01:00
STUNTransportManager.java Add more checkstyle tests 2015-03-17 22:02:44 +01:00
TcpUdpBridgeClient.java Add checkstyle check for trailing whitespace 2015-03-18 21:01:49 +01:00
TcpUdpBridgeServer.java Add more checkstyle tests 2015-03-17 22:02:44 +01:00
TestResult.java Renamed smack-jingle to smack-jingle-old 2014-08-20 00:26:02 +02:00
TransportCandidate.java Add more checkstyle tests 2015-03-17 22:02:44 +01:00
TransportNegotiator.java Merge branch '4.1' 2015-03-24 17:16:18 +01:00
TransportResolver.java Xlint all the things 2015-03-23 09:28:49 +01:00
TransportResolverListener.java Expose InterruptedException 2015-02-14 14:57:33 +01:00