Merge 1.4.1 r603:604 into trunk

This commit is contained in:
Nick Bolton
2010-06-13 00:06:11 +00:00
parent 351818a4db
commit 8ee25ea2ce
4 changed files with 5 additions and 5 deletions

View File

@@ -52,13 +52,13 @@ m_daemon(false), // daemon mode not supported on windows (use --service)
m_debugServiceWait(false),
m_relaunchMode(false),
m_pauseOnExit(false),
m_disableTray(false),
#else
m_daemon(true), // backward compatibility for unix (daemon by default)
#endif
m_backend(false),
m_restartable(true),
m_noHooks(false),
m_disableTray(false),
m_pname(NULL),
m_logFilter(NULL),
m_logFile(NULL),