aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/utils/DNSHelper.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-111-153/+75
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-101-12/+14
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-021-2/+2
|\|
| * renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-183/+0
* | Merge tag '1.5.2' into trz/rebaselookshe2015-08-111-70/+66
|/
* always add a non resolved SRV record to the listiNPUTmice2015-02-091-6/+1
* more patches for dns helperiNPUTmice2014-12-141-13/+19
* possible dns fixesiNPUTmice2014-12-141-2/+11
* Move a chunk of classes over to using JID objectsSam Whited2014-11-091-6/+8
* Merge branch 'gradle' into developmentSam Whited2014-10-301-32/+18
* Make conversations the root projectSam Whited2014-10-221-0/+185