Merge branch 'svn1_8_new'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 9 Oct 2013 11:35:05 +0000 (15:35 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 9 Oct 2013 11:35:05 +0000 (15:35 +0400)
commit65f1157a6c80bc064eafed7fac08239373dcdab0
tree938436ffe319f8f3958736a25634544584047ba1
parentf165eb71a04c7986b3cd6a31ae59c2dcaea88ca9
parentf6f6664ad5bc0ff9c805e8ba3f4ecc3bc5156abb
Merge branch 'svn1_8_new'
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/MergeFromAction.java