pulled in upstream development branch

This commit is contained in:
Dax T. Games
2015-11-14 12:15:42 -06:00
4 changed files with 14 additions and 8 deletions

View File

@ -8,4 +8,4 @@ if exist "%~1" (
start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%~1"
) else (
start %~dp0/vendor/conemu-maximus5/ConEmu.exe /Icon "%CMDER_ROOT%\icons\cmder.ico" /Title Cmder /LoadCfgFile "%CMDER_ROOT%\config\ConEmu.xml"
)
)