IntelliJ IDEA (Cassiopeia) IU-139.560.4 <riad@riad-osx1.local Delete Deployment.xml, _.xml, Default _1_.xml, riad_osx_keymap.xml, Mac OS X copy.xml, Default.xml, Mac OS X 10_5_ copy.xml, RiaD.xml, RiaD_local.xml
IntelliJ IDEA 14.0.2 <riad@riad-osx1.local Update filetypes.xml, ide.general.xml
IntelliJ IDEA 14.0.2 <riad@riad-osx1.local Update other.xml, filetypes.xml, ide.general.xml	Create Deployment.xml, _.xml, Default _1_.xml, riad_osx_keymap.xml, Mac OS X copy.xml, Default.xml, Mac OS X 10_5_ copy.xml, RiaD.xml, RiaD_local.xml
IntelliJ IDEA 14.0.2 <riad@riad-osx1.local Update filetypes.xml, ide.general.xml
IntelliJ IDEA 14.0.2 <riad@riad-osx1.local Update find.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/filetypes.xml
	$APP_CONFIG$/ide.general.xml
IntelliJ IDEA 14.0.2 <riad@riad-osx1.local Update other.xml, project.default.xml, editor.codeinsight.xml, notifications.xml, ide.general.xml, RiaD.xml, customization.xml	Create __deleted.xml
IntelliJ IDEA 14.0.2 <riad@riad-osx1.local Delete Deployment.xml, _.xml, Default _1_.xml, riad_osx_keymap.xml, Mac OS X copy.xml, Default.xml, Mac OS X 10_5_ copy.xml, RiaD.xml, RiaD_local.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/filetypes.xml
	$APP_CONFIG$/ide.general.xml
	$ROOT_CONFIG$/codestyles/RiaD.xml
IntelliJ IDEA 14.0.2 <riad@riad-osx1.local Update project.default.xml, filetypes.xml, ide.general.xml, RiaD.xml	Create Deployment.xml, _.xml, Default _1_.xml, riad_osx_keymap.xml, Mac OS X copy.xml, Default.xml, Mac OS X 10_5_ copy.xml, RiaD_local.xml