Merge remote-tracking branch 'origin/master'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Fri, 29 May 2015 12:17:43 +0000 (15:17 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Fri, 29 May 2015 12:17:43 +0000 (15:17 +0300)
commit56bae58032596f51a2880bd57b7ab8d3b46fcb2b
treeecf1a62a50cce8f970ff7b8c32b517a8cfb0dc8a
parentaf435c3504c49b78aa57ae7de85a9592fc004106
parentc3ba20788999cee34ebaeb9cc1a144886c711993
Merge remote-tracking branch 'origin/master'
platform/util/resources/misc/registry.properties
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesCacheFile.java
plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnChangeList.java