Merge branch 'svn_18_3'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 26 May 2014 13:24:58 +0000 (17:24 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 26 May 2014 13:24:58 +0000 (17:24 +0400)
Conflicts:
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browserCache/RepositoryLoader.java

1  2 
platform/platform-resources-en/src/misc/registry.properties
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileSystemListener.java
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnUtil.java
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/browserCache/RepositoryLoader.java
plugins/svn4idea/src/org/jetbrains/idea/svn/rollback/SvnRollbackEnvironment.java