CLion CL-140.569.17 <riad@riad-osx1.local Update ide.general.xml
CLion CL-140.569.17 <riad@riad-osx1.local Update Default _1_.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/ide.general.xml
	$ROOT_CONFIG$/codestyles/Default _1_.xml
CLion CL-140.569.17 <riad@riad-osx1.local Update other.xml, Default _1_.xml, editor.codeinsight.xml, notifications.xml, filetypes.xml, customization.xml	Create Deployment.xml, _.xml, baseRefactoring.xml, riad_osx_keymap.xml, Mac OS X copy.xml, Default.xml, Mac OS X 10_5_ copy.xml, RiaD.xml, RiaD_local.xml	Delete __deleted.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/filetypes.xml
	$APP_CONFIG$/ide.general.xml
	$ROOT_CONFIG$/codestyles/Default _1_.xml
	$ROOT_CONFIG$/codestyles/RiaD.xml