Merge branch 'master' into new-merge
authorAleksey Pivovarov <AMPivovarov@gmail.com>
Mon, 10 Aug 2015 10:57:32 +0000 (13:57 +0300)
committerAleksey Pivovarov <AMPivovarov@gmail.com>
Mon, 10 Aug 2015 11:02:39 +0000 (14:02 +0300)
commit3ab71ec42795fc6d2be7b1470cf035c2b0f6574c
tree7f7d36833bce00b517f20584c182bd3f9535be7d
parentd7e035d113f7467eee3245ee118827318ec2c1ce
parent2e2d02473df352f37a66a6cbde4666fae77337d6
Merge branch 'master' into new-merge

# Conflicts:
# platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java
# platform/util/resources/misc/registry.properties
platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/util/side/TwosideTextDiffViewer.java
platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
platform/platform-resources/src/META-INF/PlatformExtensionPoints.xml
platform/platform-resources/src/META-INF/PlatformExtensions.xml
platform/platform-resources/src/idea/PlatformActions.xml
platform/util/resources/misc/registry.properties