Merge branch 'svn_18_3'
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 19 Mar 2014 16:50:04 +0000 (20:50 +0400)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 19 Mar 2014 16:50:04 +0000 (20:50 +0400)
1  2 
platform/platform-resources-en/src/misc/registry.properties

index 2dccf5c5d1ba72b7a2e26683adfacc34462c3156,03e8a56424636463d5a0cc479447fe60210c8457..cfe55242b53959c4a0efbeebc044a1e84e3d4418
@@@ -373,9 -374,3 +374,9 @@@ embed.scene.builder=tru
  
  dsm.retina.darcula.legend=true
  dsm.retina.darcula.legend.description=Experimental DSM legend component
- ui.no.mac.scrollbar=false
 +
 +ide.scratch.enabled=false
 +
 +editor.injected.highlighting.enabled=true
 +editor.injected.highlighting.enabled.description=Disables injected fragments highlighting (requires project reopening)
++ui.no.mac.scrollbar=false