Merge remote-tracking branch 'origin/master'

This commit is contained in:
Steffen Schröder 2013-12-09 13:05:30 +01:00
commit 570696ad45
3 changed files with 2 additions and 3 deletions

View File

@ -1,6 +1,6 @@
REM Set the path to your php.exe here REM Set the path to your php.exe here
set phpPath="D:\Programme\xampp\php\php.exe" set phpPath="D:\xampp\php\php.exe"
REM Start ManiaControl REM Start ManiaControl
START "" /B %phpPath% -f "ManiaControl.php" 2>&1 START "" /B %phpPath% -f "ManiaControl.php" 2>&1

View File

@ -129,7 +129,7 @@ class ManiaControl implements CommandListener {
/** /**
* Quit ManiaControl and log the given message * Quit ManiaControl and log the given message
* *test
* @param string $message * @param string $message
*/ */
public function quit($message = false) { public function quit($message = false) {

View File

@ -22,7 +22,6 @@ class SettingManager {
* Private properties * Private properties
*/ */
private $maniaControl = null; private $maniaControl = null;
private $configurator = null;
private $arrayDelimiter = ';;'; private $arrayDelimiter = ';;';
/** /**