IntelliJ IDEA (Cassiopeia) IU-140.SNAPSHOT <develar@develar-air.local Update other.xml
IntelliJ IDEA (Cassiopeia) IU-140.SNAPSHOT <develar@develar-air.local Update project.default.xml
IntelliJ IDEA (Cassiopeia) IU-140.1120 <develar@develar-air.fritz.box Update debugger.xml
IntelliJ IDEA (Cassiopeia) IU-140.1087 <develar@develar-air.fritz.box Update other.xml, debugger.xml
IntelliJ IDEA (Cassiopeia) IU-140.1061 <develar@develar-air.local Update project.default.xml, usageView.xml
IntelliJ IDEA (Cassiopeia) IU-140.1061 <develar@develar-air.local Update project.default.xml
Merge branch 'master'

Conflicts:
	$APP_CONFIG$/project.default.xml