~saiko/intellij-settings

ref: 78ffd88930cebfbe833019d06a95f4f7a709d84e intellij-settings/filetypes.xml -rw-r--r-- 641 bytes
RD-2020.3.3 <saiko@invader Update filetypes.xml, pluginAdvertiser.xml
RD-2020.3.3 <saiko@invader Merge branch 'master'
IU-2020.3.2 <saiko@invader Merge branch 'master'
PY-2020.3.3 <saiko@invader Merge branch 'master'

Conflicts:
	pluginAdvertiser.xml
CL-2020.3.2 <saiko@invader Update filetypes.xml
IU-2020.3.1 <saiko@invader Update filetypes.xml, pluginAdvertiser.xml, IntelliJ _KDE_ copy.xml
IU-2020.3.1 <saiko@invader Merge branch 'master'

Conflicts:
	filetypes.xml
IU-2020.3.1 <saiko@invader Update filetypes.xml, editor.xml
CL-2020.3 <saiko@invader Update filetypes.xml, pluginAdvertiser.xml
CL-2020.3 <saiko@invader Merge branch 'master'
RD-2020.3.2 <saiko@invader Merge branch 'master'
RD-2020.3.2 <saiko@invader Update filetypes.xml, pluginAdvertiser.xml	Create keymap.xml, IntelliJ _KDE_ copy.xml
CL-2020.3 <saiko@invader Update filetypes.xml
CL-2020.3 <saiko@invader Update filetypes.xml
IU-2020.3.1 <saiko@invader Merge branch 'master'

Conflicts:
	filetypes.xml
IU-2020.3.1 <saiko@invader Update filetypes.xml
CL-2020.3 <saiko@invader Update filetypes.xml
RD-2020.3.2 <saiko@invader Merge branch 'master'
IU-2020.3.1 <saiko@invader Merge branch 'master'

Conflicts:
	editor.xml
	filetypes.xml
IU-2020.3.1 <saiko@invader Update filetypes.xml, pluginAdvertiser.xml, colors.scheme.xml, editor.xml, laf.xml
Next