Merge branch 'IDEA-CR-10038'
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 17 May 2016 09:12:11 +0000 (11:12 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Tue, 17 May 2016 09:12:11 +0000 (11:12 +0200)
# Conflicts:
# platform/built-in-server/src/org/jetbrains/ide/OpenFileHttpService.java
# platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java
# platform/util/resources/misc/registry.properties

1  2 
platform/platform-impl/src/com/intellij/ide/impl/ProjectUtil.java
platform/util/resources/misc/registry.properties

index c8648ef5237aa168076a8082a675d28962d2a83e,e7f4afa4dbea2e41aead34f3523afcc384622c2e..1612b54c36c6ba96867e167605aa7b8583e3cf9c
@@@ -739,5 -739,6 +739,9 @@@ ide.screenreader.autodetect.accessibili
  editor.rainbow.identifiers=false
  editor.rainbow.identifiers.description=Rainbow identifiers in editor
  
- ide.intellij.laf.win10.ui.description=Enables Windows 10 look
 +ide.intellij.laf.win10.ui=false
++ide.intellij.laf.win10.ui.description=Enables Windows 10 look
++
+ ide.http.server.response.actual.status=false
+ ide.rest.api.requests.per.minute=30
+ ide.built.in.web.server.activatable=false