Conversations/src/main/java/eu/siacs/conversations/xmpp/jingle
Sam Whited 46f147a82c Merge branch 'gradle' into development
Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib
2014-10-30 15:33:13 -04:00
..
stanzas Make conversations the root project 2014-10-22 15:47:11 -04:00
JingleCandidate.java Make conversations the root project 2014-10-22 15:47:11 -04:00
JingleConnection.java Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
JingleConnectionManager.java Merge branch 'gradle' into development 2014-10-30 15:33:13 -04:00
JingleInbandTransport.java Make conversations the root project 2014-10-22 15:47:11 -04:00
JingleSocks5Transport.java Make conversations the root project 2014-10-22 15:47:11 -04:00
JingleTransport.java Make conversations the root project 2014-10-22 15:47:11 -04:00
OnFileTransmissionStatusChanged.java Make conversations the root project 2014-10-22 15:47:11 -04:00
OnJinglePacketReceived.java Make conversations the root project 2014-10-22 15:47:11 -04:00
OnPrimaryCandidateFound.java Make conversations the root project 2014-10-22 15:47:11 -04:00
OnTransportConnected.java Make conversations the root project 2014-10-22 15:47:11 -04:00