wowario 269bfca622 Build: resolve merge conflicts

2018-05-24 14:36:15 +03:00

..

boost/archive

Silence stupid fallthru warning in gcc 7

2017-08-21 10:16:10 +01:00

db_drivers

ITS#8831 move flag init into readhdr

2018-05-16 15:18:24 +03:00

easylogging++

Merge pull request #3187

2018-02-16 14:20:31 +01:00

miniupnp @ 6a63f99549

add submodules

2018-05-16 15:39:36 +03:00

rapidjson

update rapidjson

2016-09-17 09:35:49 +02:00

unbound @ 193bdc4ee3

Unbound: add git submodule for unbound

2018-03-18 15:52:27 +00:00

CMakeLists.txt

Build: resolve merge conflicts

2018-05-24 14:36:15 +03:00