Merge remote-tracking branch 'origin/master'
authorKonstantin Bulenkov <kb@jetbrains.com>
Mon, 25 Jul 2016 13:20:43 +0000 (15:20 +0200)
committerKonstantin Bulenkov <kb@jetbrains.com>
Mon, 25 Jul 2016 13:20:43 +0000 (15:20 +0200)
1  2 
platform/util/resources/misc/registry.properties

index d3f8b66fa27fe6cbe409e9e30765a3f1812f9632,e46d70db7e6e5566a7ab746baebe7a727b75a62a..04ad69a6c18036eebfc858fef5d2e58e5d7a2ffd
@@@ -731,7 -731,7 +731,7 @@@ testDiscovery.enabled=fals
  ruby.remote.debugger.supports.catchpoint.removal=true
  
  use.read.action.to.init.service=false
- saving.state.in.new.format.is.allowed=false
+ saving.state.in.new.format.is.allowed=true
  
  ide.mac.new.color.picker=false
  
@@@ -786,5 -786,3 +786,5 @@@ rainbow.highlighter.colors.description=
  ide.new.icons=false
  ide.new.icons.restartRequired=true
  ide.new.icons.description=Trying new platform icons
- ide.new.icons.root.description=At the moment can be /newicons or /newicons1
 +ide.new.icons.root=/newicons
++ide.new.icons.root.description=At the moment can be /newicons or /newicons1