Merge branch 'develop' into nonroot

This commit is contained in:
badaix 2016-10-22 20:24:40 +02:00
commit 8ae203eece
35 changed files with 1169 additions and 1010 deletions

View file

@ -21,7 +21,7 @@
#include "popl.hpp"
#include "controller.h"
#include "browsemDNS.h"
#include "browseZeroConf/browsemDNS.h"
#ifdef HAS_ALSA
#include "player/alsaPlayer.h"
@ -68,7 +68,7 @@ PcmDevice getPcmDevice(const std::string& soundcard)
int main (int argc, char **argv)
{
#ifdef MACOS
#pragma message "Warning: the Mac OS support is experimental and might not be maintained"
#pragma message "Warning: the macOS support is experimental and might not be maintained"
#endif
try
{