Commit Graph

521 Commits

Author SHA1 Message Date
martind2000
c3348517a2 WS-11.0.3 <marti@DESKTOP-ITST4MB Merge branch 'master'
Conflicts:
	colors/Cobalt copy.icls
2016-03-15 21:56:09 +00:00
martind2000
77fec01828 WS-11.0.3 <marti@DESKTOP-ITST4MB Update ignore.xml, Cobalt copy.icls 2016-03-15 21:56:01 +00:00
Martin Donnelly
e81ebe6dfa WS-11.0.3 <martin@steamrunner.local Update Cobalt copy.icls 2016-03-15 13:58:12 +00:00
Martin Donnelly
352b781351 WS-11.0.3 <martin@steamrunner.local Update ignore.xml Create code.style.schemes.xml 2016-03-15 09:17:18 +00:00
Martin Donnelly
8728e38e17 WS-11.0.3 <martin@steamrunner.local Merge branch 'master' 2016-03-14 17:10:37 +00:00
Martin Donnelly
f0944d0d34 WS-11.0.3 <martin@steamrunner.local Update Martins Style.xml 2016-03-14 11:56:58 +00:00
martind2000
5e47533dbb WS-11.0.3 <marti@DESKTOP-ITST4MB Update ignore.xml, md.icls 2016-03-13 18:27:24 +00:00
martind2000
f38db9477c WS-11.0.3 <marti@DESKTOP-ITST4MB Merge branch 'master' 2016-03-13 18:16:44 +00:00
Martin Donnelly
a539c66efc WS-11.0.3 <martin@steamrunner.local Merge branch 'master' 2016-03-11 10:07:48 +00:00
Martin Donnelly
111a86ed78 WS-11.0.3 <martin@steamrunner.local Update ignore.xml 2016-03-11 10:07:48 +00:00
martind2000
fd49979f36 WS-11.0.3 <marti@DESKTOP-ITST4MB Update ignore.xml, filetypes.xml Delete code.style.schemes.xml 2016-03-10 20:26:19 +00:00
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
martind2000
ceb6eeaf39 WS-11.0.3 <marti@DESKTOP-ITST4MB Update Cobalt copy.icls 2016-03-10 20:13:23 +00:00
Martin Donnelly
a03d0782c8 WS-11.0.3 <martin@steamrunner.local Update ui.lnf.xml, filetypes.xml, Cobalt copy.icls, Martins Style.xml Delete scratches.xml 2016-03-10 14:57:35 +00:00
Martin Donnelly
6ea16dfc41 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
martind2000
d3bf10df95 WS-11.0.3 <marti@DESKTOP-ITST4MB Overwrite remote http://martind2000@gitlab.silvrtree.co.uk/martind2000/IntellijSettings.git to local 2016-03-08 22:18:51 +00:00
martind2000
7cc7e2157a WS-11.0.3 <marti@DESKTOP-ITST4MB Update ignore.xml 2016-03-08 22:00:27 +00:00
martind2000
2821e530ca WS-11.0.3 <marti@DESKTOP-ITST4MB Update filetypes.xml 2016-03-08 21:56:08 +00:00
martind2000
1f74338fbd WS-11.0.3 <marti@DESKTOP-ITST4MB Merge branch 'master' 2016-03-08 21:55:41 +00:00
martind2000
823ac36723 WS-11.0.3 <marti@DESKTOP-ITST4MB Update Default _1_.xml, git.xml, applicationLibraries.xml 2016-03-08 21:55:41 +00:00
Martin Donnelly
e9df0d5a22 WS-11.0.3 <Martin@Martin-PC Update filetypes.xml 2016-03-07 10:32:12 +00:00
martind2000
a692ccbd83 WS-11.0.3 <marti@DESKTOP-ITST4MB Update other.xml 2016-03-06 22:14:33 +00:00
martind2000
f33a5c6eae WS-11.0.3 <marti@DESKTOP-ITST4MB Update filetypes.xml, vcs.xml 2016-03-04 23:16:52 +00:00
Martin Donnelly
a786604ce8 WS-11.0.3 <Martin@Martin-PC Update Cobalt copy.icls 2016-03-04 10:26:03 +00:00
Martin Donnelly
cf0c9b3ac6 WS-11.0.3 <Martin@Martin-PC Update ignore.xml 2016-03-04 09:54:33 +00:00
Martin Donnelly
f732904fbb WS-11.0.3 <Martin@Martin-PC Update filetypes.xml 2016-03-03 15:30:36 +00:00
martind2000
7004118612 WS-11.0.3 <marti@DESKTOP-ITST4MB Update filetypes.xml, scratches.xml 2016-03-02 21:08:25 +00:00
Martin Donnelly
0d3c03e80c WS-11.0.3 <Martin@Martin-PC Update scratches.xml 2016-03-02 15:29:42 +00:00
Martin Donnelly
db45edc24a WS-11.0.3 <Martin@Martin-PC Update filetypes.xml 2016-03-01 10:43:49 +00:00
martind2000
c9870cc7cc WS-11.0.3 <marti@DESKTOP-ITST4MB Update scratches.xml 2016-02-29 23:04:20 +00:00
martind2000
1da913a48c WS-11.0.3 <marti@DESKTOP-ITST4MB Update filetypes.xml 2016-02-29 19:51:33 +00:00
Martin Donnelly
5838030efb WS-11.0.3 <Martin@Martin-PC Create editor.codeinsight.xml 2016-02-29 16:31:29 +00:00
Martin Donnelly
a65951d4c4 WS-11.0.3 <Martin@Martin-PC Update filetypes.xml, other.xml 2016-02-29 15:06:07 +00:00
Martin Donnelly
914a42b4e8 WS-11.0.3 <Martin@Martin-PC Merge branch 'master' 2016-02-29 14:57:19 +00:00
Martin Donnelly
bc288d2eb4 WS-11.0.3 <Martin@Martin-PC Update Default _1_.xml, git.xml, Cobalt copy.icls 2016-02-29 09:39:05 +00:00
martind2000
870ed29303 WS-11.0.3 <marti@DESKTOP-ITST4MB Update other.xml 2016-02-28 20:33:54 +00:00
martind2000
812f8c131d WS-11.0.3 <marti@DESKTOP-ITST4MB Update filetypes.xml 2016-02-27 18:45:25 +00:00
Martin Donnelly
da23e5fb90 WS-11.0.3 <Martin@Martin-PC Create terminal.xml 2016-02-26 15:59:05 +00:00
Martin Donnelly
30fa93aa78 WS-11.0.3 <Martin@Martin-PC Update baseRefactoring.xml 2016-02-24 16:25:59 +00:00
Martin Donnelly
cea485a751 WS-11.0.3 <Martin@Martin-PC Create applicationLibraries.xml 2016-02-24 10:02:23 +00:00
Martin Donnelly
5cb8912333 WS-11.0.3 <Martin@Martin-PC Update filetypes.xml 2016-02-24 09:32:12 +00:00
martind2000
8bd8dcac6e WS-11.0.3 <marti@DESKTOP-ITST4MB Update Default _1_.xml, filetypes.xml 2016-02-23 19:05:49 +00:00
Martin Donnelly
6e1559bd6c WS-11.0.3 <Martin@Martin-PC Create remote-servers.xml, remote-server-client-libraries.xml 2016-02-23 14:18:49 +00:00
Martin Donnelly
92a6e35b03 WS-11.0.3 <Martin@Martin-PC Update filetypes.xml 2016-02-23 10:00:27 +00:00
Martin Donnelly
fac9eb4959 WS-11.0.3 <Martin@Martin-PC Update filetypes.xml, other.xml 2016-02-23 09:44:08 +00:00
martind2000
48b807ad2f WS-11.0.3 <marti@DESKTOP-ITST4MB Update filetypes.xml, Cobalt copy.icls, other.xml, scratches.xml 2016-02-22 22:55:10 +00:00
martind2000
37917e46f9 WS-11.0.3 <marti@DESKTOP-ITST4MB Merge branch 'master' 2016-02-22 22:43:38 +00:00
martind2000
b5be1c69f7 WS-11.0.3 <marti@DESKTOP-ITST4MB Update git.xml 2016-02-22 22:43:38 +00:00
Martin Donnelly
e5f7a057bc WS-11.0.3 <Martin@Martin-PC Update scratches.xml 2016-02-22 17:05:20 +00:00
Martin Donnelly
b865d192b3 WS-11.0.3 <Martin@Martin-PC Update other.xml 2016-02-22 10:57:58 +00:00