Merge branch 'svn_18_3'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 14 Jul 2014 16:45:44 +0000 (20:45 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Mon, 14 Jul 2014 16:45:44 +0000 (20:45 +0400)
commit51292ab2af411af4bc6b7a00b2c0fc142049e23f
treeb401df805e33f6f0020f35f06bd947c50b3e8941
parent93e45b92d82df9f1fd47e5cdc50d53ca23e1ef12
parent511f0712c416127a1be2684130bf9e1bd32fd944
Merge branch 'svn_18_3'
platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnFileSystemListener.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java
plugins/svn4idea/src/org/jetbrains/idea/svn/rollback/SvnRollbackEnvironment.java
plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java