Merge branch 'svn_18_3'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Fri, 1 Aug 2014 09:54:28 +0000 (13:54 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Fri, 1 Aug 2014 09:54:28 +0000 (13:54 +0400)
Conflicts:
plugins/git4idea/src/git4idea/history/GitDiffFromHistoryHandler.java

1  2 
platform/util/resources/misc/registry.properties
plugins/svn4idea/src/org/jetbrains/idea/svn/SvnRecursiveStatusWalker.java

index 96dd1db9c255b5ab9ad89b86ef86762f52d9b188,a78c26c7e9c835f7214d81b2b98888f1ea651acd..99ff576c6ad6df34b287c3ba0a109a5bdc9d6efd
@@@ -395,7 -393,4 +396,7 @@@ commonjs.complete.required.filename.wit
  
  
  fix.jdk7.alt.shortcuts=true
 -fix.jdk7.alt.shortcuts.description=Allow to use alt for shortcuts on MacOSX with jdk7+
 +fix.jdk7.alt.shortcuts.description=Allow to use alt for shortcuts on MacOSX with jdk7+
 +
 +ide.new.markup.markers=true
- ide.new.markup.markers.description=New error stripe markers
++ide.new.markup.markers.description=New error stripe markers