aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-101-2/+1
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-021-10/+10
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-061-2/+4
|\|
| * renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-234/+0
* | Merge tag '1.5.2' into trz/rebaselookshe2015-08-111-12/+24
|/
* better cleanup after unsuccesful transfersiNPUTmice2014-11-151-0/+14
* progress for ibb transfersiNPUTmice2014-11-151-2/+2
* basic arbitrary file transferiNPUTmice2014-11-151-0/+8
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-091-2/+2
* Make conversations the root projectSam Whited2014-10-221-0/+212