IntellijSettings/colors
Martin Donnelly bb62daae1c WS-2018.2.2 <martin@Steamrunner.local Merge branch 'master'
Conflicts:
	codestyles/Default.xml
	colors/Cobalt copy.icls
	filetypes.xml
	find.xml
	scratches.xml
	ui.lnf.xml
2018-09-10 14:24:34 +01:00
..
_@user_Blackboard.icls WS-2016.3.3 <mdonnel@EDINBK107739 Create Borland copy.icls, _@user_Blackboard.icls 2017-03-01 09:38:03 +00:00
_@user_Twilight.icls WS-2017.1 <mdonnel@EDINBK107739 Update colors.scheme.xml Create Monokai copy.icls, _@user_Twilight.icls 2017-04-04 14:00:28 +01:00
Blackbored.icls WS-2016.2.4 <martin@ubuntu Update Cobalt copy.icls, Borland.icls, md.icls, Blackbored.icls, webServers.xml 2016-10-21 10:26:42 +01:00
Borland copy.icls WS-2016.3.3 <mdonnel@EDINBK107739 Create Borland copy.icls, _@user_Blackboard.icls 2017-03-01 09:38:03 +00:00
Borland.icls WS-2016.2.4 <martin@ubuntu Update Cobalt copy.icls, Borland.icls, md.icls, Blackbored.icls, webServers.xml 2016-10-21 10:26:42 +01:00
Cobalt copy.icls WS-2018.1 <martin@Steamrunner.local Update Cobalt copy.icls 2018-09-10 14:21:51 +01:00
md.icls WS-2016.2.4 <martin@ubuntu Update Cobalt copy.icls, Borland.icls, md.icls, Blackbored.icls, webServers.xml 2016-10-21 10:26:42 +01:00
Monokai copy.icls WS-2017.1.2 <mdonnel@EDINBK107739 Update Monokai copy.icls 2017-04-28 11:20:17 +01:00