Merge branch 'svn_18_3'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 6 May 2014 12:52:42 +0000 (16:52 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 6 May 2014 12:52:42 +0000 (16:52 +0400)
commit8b762a551f0bcbd1662ff258bb1b63f648cfa193
tree60efc6e369673c9beacaaf8d806def6cde9421fb
parent7ee2226cd38d08f0e621d87d9eee59ab510dd152
parent3b7d2e9bbe513d1ffc8f08bcd0164867fbd11108
Merge branch 'svn_18_3'
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnConfigurable.java
plugins/svn4idea/src/org/jetbrains/idea/svn/auth/SvnAuthenticationNotifier.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SSHCredentialsDialog.java
plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/MergeFromTheirsResolver.java