WS-2016.3.3 <mdonnel@EDINBK107739 Merge branch 'master'

This commit is contained in:
mdonnel 2017-02-08 13:47:10 +00:00
commit e044becdc8

View File

@ -1,12 +1,12 @@
<scheme name="Cobalt copy" version="142" parent_scheme="Default"> <scheme name="Cobalt copy" version="142" parent_scheme="Default">
<option name="EDITOR_FONT_SIZE" value="12" /> <option name="EDITOR_FONT_SIZE" value="22" />
<option name="CONSOLE_FONT_NAME" value="Roboto Mono" /> <option name="CONSOLE_FONT_NAME" value="Source Code Pro" />
<option name="CONSOLE_LIGATURES" value="true" /> <option name="CONSOLE_FONT_SIZE" value="14" />
<option name="EDITOR_FONT_NAME" value="Consolas" /> <option name="EDITOR_FONT_NAME" value="Roboto Mono" />
<colors> <colors>
<option name="CARET_COLOR" value="ffffff" /> <option name="CARET_COLOR" value="ffffff" />
<option name="CARET_ROW_COLOR" value="1629" /> <option name="CARET_ROW_COLOR" value="1629" />
<option name="CONSOLE_BACKGROUND_KEY" value="204" /> <option name="CONSOLE_BACKGROUND_KEY" value="2240" />
<option name="GUTTER_BACKGROUND" value="2240" /> <option name="GUTTER_BACKGROUND" value="2240" />
<option name="INDENT_GUIDE" value="25425c" /> <option name="INDENT_GUIDE" value="25425c" />
<option name="LINE_NUMBERS_COLOR" value="ffffff" /> <option name="LINE_NUMBERS_COLOR" value="ffffff" />
@ -305,7 +305,9 @@
</value> </value>
</option> </option>
<option name="CONSOLE_NORMAL_OUTPUT"> <option name="CONSOLE_NORMAL_OUTPUT">
<value /> <value>
<option name="FOREGROUND" value="ffffff" />
</value>
</option> </option>
<option name="CONSOLE_RED_OUTPUT"> <option name="CONSOLE_RED_OUTPUT">
<value> <value>
@ -313,7 +315,9 @@
</value> </value>
</option> </option>
<option name="CONSOLE_SYSTEM_OUTPUT"> <option name="CONSOLE_SYSTEM_OUTPUT">
<value /> <value>
<option name="FOREGROUND" value="e4e4ff" />
</value>
</option> </option>
<option name="CONSOLE_USER_INPUT"> <option name="CONSOLE_USER_INPUT">
<value> <value>