Merge branch 'v0.20.x'

This commit is contained in:
Max Kellermann
2017-12-16 20:50:53 +01:00
105 changed files with 270 additions and 240 deletions

View File

@@ -22,7 +22,7 @@
#include "Compiler.h"
#include <upnp/upnptools.h>
#include <upnptools.h>
static inline constexpr unsigned
CountNameValuePairs() noexcept