Merge remote-tracking branch 'upstream/master'

Merging upstream before commit
This commit is contained in:
Simon
2016-05-04 21:17:21 +01:00

View File

@@ -45,7 +45,7 @@
#if defined(_WIN32) || defined(_WIN64)
const char* DEFAULT_INI_FILE = "mmdvm.ini";
#else
const char* DEFAULT_INI_FILE = "/etc/mmdvm.ini";
const char* DEFAULT_INI_FILE = "/etc/MMDVM.ini";
#endif
static bool m_killed = false;