diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-21 00:31:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-16 04:55:08 +0000 |
| commit | 9cde0e3c015174898df8b8f3672185941fad4786 (patch) | |
| tree | 80a55c7b59c38377216daaada4e8bc47b69ceb9a /platform/util/resources/misc/registry.properties | |
| parent | 3b37877a2561bf9fbe072253a18688807d523505 (diff) | |
| parent | d76e3920c56d37c942092b7dca20fcaded81c0a5 (diff) | |
| download | idea-9cde0e3c015174898df8b8f3672185941fad4786.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/util/resources/misc/registry.properties')
| -rw-r--r-- | platform/util/resources/misc/registry.properties | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index bbda04a2461a..e9802f2321ae 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -43,6 +43,8 @@ actionSystem.enableAbbreviations=true ide.firstStartup=true ide.debugMode=false +ide.debugger.inline=false +ide.debugger.inline.description=Enables variables view in editor ide.debugMode.description=Record additional information to make bug reports more informative. ide.debug.minProgressTime=0 ide.forcedShowTooltip=alt @@ -313,6 +315,7 @@ testng_sm_runner=false show.flex.debug.design.view=false git.new.log=true diff.patience.alg=false +diff.status.tracker.skip.spaces=true svn.use.terminal=false svn.use.incoming.optimization=false @@ -391,6 +394,7 @@ console.too.much.text.buffer.ratio.description=Used for disabling of console pro when there is too much of text to process.\n\ The ratio is used against the console cycle buffer size (idea.cycle.buffer.size/theRatio=maxTextLength). ide.file.settings.order.new=false +ide.file.settings.tree.new=false ide.new.project.settings=true ide.new.project.settings.description=Temporary key for new project settings dialog UI |