Merge branch 'svn_18_3'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 13 Aug 2014 09:25:43 +0000 (13:25 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 13 Aug 2014 09:25:43 +0000 (13:25 +0400)
1  2 
platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java