merge conflict resolution
[oweals/gnunet.git] / src / hostlist / gnunet-daemon-hostlist_client.c
2019-01-16 ng0Merge branch 'license/spdx'
2019-01-14 ng0src: for every AGPL3.0 file, add SPDX identifier.
2018-06-13 Nils GillmannMerge branch 'master' of gnunet.org:gnunet
2018-06-11 Phil-Merge branch 'master' of ssh://gnunet.org/gnunet into...
2018-06-07 psyc://loupsycedyg... paragraph for gnunet devs that don't know how to use...
2018-06-07 psyc://loupsycedyg... glitch in the license text detected by hyazinthe, thank...
2018-06-05 psyc://loupsycedyg... first batch of license fixes (boring)
2018-06-04 Phil-merge branch 'master' of ssh://gnunet.org/gnunet into...
2018-06-04 Christian Grothoffmerge benchmark changes
2018-05-27 Christian Grothoffskip validation logic
2017-03-29 Schanzenbach, Martin- merge with master
2017-03-24 xrsMerge branch 'master' of ssh://gnunet.org/gnunet
2017-03-22 tg(x)Merge branch 'master' of gnunet.org:gnunet
2017-03-17 Christian Grothoffmore renamings relating to 'new' service now just being...
2017-01-20 Schanzenbach, Martin- merge; service API change
2017-01-10 Christian Grothoffrename connecT -> connect now that the old API is dead
2016-07-31 Christian Grothoffconvering more services to new core MQ API
2016-07-08 Christian Grothoff-avoid calling memcpy() with NULL argument, even if...
2016-07-08 Christian Grothoffmigrate transport_core API to MQ
2016-06-21 Christian Grothoffupdate statistics API to use new MQ API style, also...
2016-04-30 Christian Grothoffimplementing new scheduler shutdown semantics
2016-04-09 Christian Grothoffsmall API change: do no longer pass rarely needed GNUNE...
2016-01-19 Christian Grothoff-fix (C) notices
2015-06-30 Christian Grothofffix #3869: outdated FSF address
2015-06-21 Christian Grothoffsupport gnurl's curl.h being in include/gnurl/ OR inclu...
2015-02-07 Christian Grothoff-bringing copyright tags up to FSF standard
2015-01-05 David BarksdaleCheck return value of GNUNET_STATISTICS_get
2014-12-24 Christian Grothoffmaking GNUNET_SCHEDULER_cancel() perform in O(1) instea...
2014-12-23 Christian Grothoff-actually, require proxy option to be empty, cleaner
2014-12-23 Christian Grothoff-do run with proxy type NONE
2014-12-18 Christian Grothoff-use const in peerstore callback
2014-07-24 Matthias Wachsdoxygen fixes
2014-06-03 Christian Grothoff-doxygen, code cleanup