martind2000 eb63225ec4 WS-11.0.3 <marti@DESKTOP-ITST4MB Merge branch 'master' ...

Conflicts:
	colors/Cobalt copy.icls

2016-03-10 20:16:15 +00:00

..

Blackbored.icls

WS-11.0.3 <martin@steamrunner.local Update baseRefactoring.xml, ide.general.xml, Default.xml, project.default.xml, diff.xml, other.xml, ignore.xml, find.xml, ui.lnf.xml, Default _1_.xml, web-browsers.xml, filetypes.xml, vcs.xml, Cobalt copy.icls, editor.codeinsight.xml, code.style.schemes.xml, watcherDefaultTasks.xml, editor.xml, debugger.xml Create Martins Style.icls, print.xml, textmate.xml, git.xml, SQL Script.sql, Default.icls, Deployment.icls, notifications.xml, path.macros.xml, Martins Style.xml, Scriptagr.am Markdown.md, github_settings.xml, Default _1_.icls, EJS.ejs, JavaScript File.js, hg.xml, customization.xml, Borland.icls, md.icls, Project Default.xml, duplocatorSettings.xml, laf.xml, abbreviations.xml, proxy.settings.xml, Blackbored.icls, keymap.xml, applicationLibraries.xml, webServers.xml

2016-03-10 14:40:04 +00:00

Borland.icls

WS-11.0.3 <martin@steamrunner.local Update baseRefactoring.xml, ide.general.xml, Default.xml, project.default.xml, diff.xml, other.xml, ignore.xml, find.xml, ui.lnf.xml, Default _1_.xml, web-browsers.xml, filetypes.xml, vcs.xml, Cobalt copy.icls, editor.codeinsight.xml, code.style.schemes.xml, watcherDefaultTasks.xml, editor.xml, debugger.xml Create Martins Style.icls, print.xml, textmate.xml, git.xml, SQL Script.sql, Default.icls, Deployment.icls, notifications.xml, path.macros.xml, Martins Style.xml, Scriptagr.am Markdown.md, github_settings.xml, Default _1_.icls, EJS.ejs, JavaScript File.js, hg.xml, customization.xml, Borland.icls, md.icls, Project Default.xml, duplocatorSettings.xml, laf.xml, abbreviations.xml, proxy.settings.xml, Blackbored.icls, keymap.xml, applicationLibraries.xml, webServers.xml

2016-03-10 14:40:04 +00:00

Cobalt copy.icls

WS-11.0.3 <marti@DESKTOP-ITST4MB Merge branch 'master'

2016-03-10 20:16:15 +00:00

md.icls

WS-11.0.3 <martin@steamrunner.local Update baseRefactoring.xml, ide.general.xml, Default.xml, project.default.xml, diff.xml, other.xml, ignore.xml, find.xml, ui.lnf.xml, Default _1_.xml, web-browsers.xml, filetypes.xml, vcs.xml, Cobalt copy.icls, editor.codeinsight.xml, code.style.schemes.xml, watcherDefaultTasks.xml, editor.xml, debugger.xml Create Martins Style.icls, print.xml, textmate.xml, git.xml, SQL Script.sql, Default.icls, Deployment.icls, notifications.xml, path.macros.xml, Martins Style.xml, Scriptagr.am Markdown.md, github_settings.xml, Default _1_.icls, EJS.ejs, JavaScript File.js, hg.xml, customization.xml, Borland.icls, md.icls, Project Default.xml, duplocatorSettings.xml, laf.xml, abbreviations.xml, proxy.settings.xml, Blackbored.icls, keymap.xml, applicationLibraries.xml, webServers.xml

2016-03-10 14:40:04 +00:00