Version 0.6.17.4 .

Version 0.6.17.4 .

svn merge -c 26105 https://dart.googlecode.com/svn/branches/bleeding_edge trunk

Committed: https://code.google.com/p/dart/source/detail?r=26106

[ricow1, 2013-08-14 07:41:15]

There was actually a minor merge conflict. This is now the diff to bleeding edge
on the DartReconcilingStrategyTest.java

diff
trunk/dart/editor/tools/plugins/com.google.dart.tools.ui_test/src/com/google/dart/tools/ui/internal/text/dart/DartReconcilingStrategyTest.java
bleeding_edge/dart/editor/tools/plugins/com.google.dart.tools.ui_test/src/com/google/dart/tools/ui/internal/text/dart/DartReconcilingStrategyTest.java
339c339
<     CompilationUnit unit = mockContext.waitForResolution(mockSource, 5000);
---
>     CompilationUnit unit = mockContext.waitForResolution(mockSource, 15000);
365c365
<     CompilationUnit unit = mockContext.waitForResolution(mockSource, 5000);
---
>     CompilationUnit unit = mockContext.waitForResolution(mockSource, 15000);

Looking at that my assumption is that this is just how long of a timeout we have
- i.e., we have a higher timeout now, which I will stick with.

[ricow1, 2013-08-14 07:43:15]

TBR

[ricow1, 2013-08-14 07:43:33]

Committed patchset #1 manually as r26106 (presubmit successful).