Merge branch 'nz/shared_shelf'
authorNadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Mon, 17 Aug 2015 16:39:55 +0000 (19:39 +0300)
committerNadya Zabrodina <Nadya.Zabrodina@jetbrains.com>
Mon, 17 Aug 2015 16:39:55 +0000 (19:39 +0300)
commit244b34b87d69fd93848f4048051fdcff04937a25
tree78f8797bce27b35b99c4cf6ed6e582191ef9dd35
parentac396b2a588337795139ab604fd3d60a78aec899
parent6419125cc2f1fe8f52a816f500f07701122ec70e
Merge branch 'nz/shared_shelf'

Conflicts:
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/CompoundShelfFileProcessor.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/shelf/ShelveChangesManager.java