aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-101-1/+1
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-021-7/+7
|\|
* | 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-224/+0
* | Merge tag '1.5.2' into trz/rebaselookshe2015-08-111-26/+44
|/
* Make IqPacket type an enumSam Whited2015-01-041-7/+7
* Fix typo in method nameSam Whited2014-12-291-3/+3
* better cleanup after unsuccesful transfersiNPUTmice2014-11-151-1/+15
* made file transfers cancelableiNPUTmice2014-11-151-4/+14
* progress for ibb transfersiNPUTmice2014-11-151-6/+16
* Update more files to use JID objectsSam Whited2014-11-091-7/+6
* Make conversations the root projectSam Whited2014-10-221-0/+191