1>branch-info.txt for GWT 2.0 release:
Tracks interactions between this branch and other branches. 
See: http://code.google.com/p/google-web-toolkit/wiki/ManagingMerges

Copies:
/releases/2.0/ was created (6420) as a straight copy from /trunk@r6417

svn cp -r 6417 https://google-web-toolkit.googlecode.com/svn/trunk \
  https://google-web-toolkit.googlecode.com/svn/releases/2.0

Merges to this branch:

trunk@6418 was merged into this branch, Add threadCount option in build file
    svn merge --ignore_ancestry -c 6418 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6425 was merged into this branch, Add compile properties on test methods
    svn merge --ignore_ancestry -c 6425 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6429 was merged into this branch, Bugfix when rewriting static calls with JMultiExpr qualifiers
    svn merge --ignore_ancestry -c 6429 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6432 was merged into this branch, Merge branch 'remote-ui-communication' at r6431 into trunk.
    svn merge --ignore_ancestry -c 6432 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6434 was merged into this branch, bugfix in HybridServiceServlet
  . svn merge --ignore-ancestry -c 6434 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6437 was merged into this branch, Fixes a couple of build-breaking, checkstyle violations
    svn merge --ignore-ancestry -c 6437 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6445 was merged into this branch, Limit permutations based on user agents
    svn merge --ignore-ancestry -c 6445 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6451 was merged into this branch
 Fixes @DefaultLocale("foo") when foo is not in the locale list
    svn merge --ignore-ancestry -c6451 \
      https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6452 was merged into this branch, Suppress spurious JSNI ref warnings
    svn merge --ignore-ancestry -c 6452 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6455:6459 was merged into this branch
  Fixes a bug in CssProperty where is adds extra space in CSS expressions
  Fixes JUnitShell to wait indefinitely for BrowserManagerServer to start test
  Disables a couple of tests in HtmlUnit
    svn merge --ignore-ancestry -r6455:6459 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6462:6464 was merged into this branch
  Adds basic test case for SOYC.
    svn merge --ignore-ancestry -r6462:6464 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6470 was merged into this branch
  Fix for issue 3374, URL.encodeComponent replaces %20's with +'s
    svn merge --ignore-ancestry -c 6470 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6443 was merged into this branch
  Updates to use the rebased protobuf library
    svn merge --ignore-ancestry -c 6443 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6479 was merged into this branch
  This allows multiple source files to be specified for a ui:style
    svn merge --ignore-ancestry -c 6479 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6481 was merged into this branch
  Get rid of deprecated MenuItemHTML support
    svn merge --ignore-ancestry -c 6481 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6486 was merged into this branch
  Trivial fix for issue 4067, UiBinderGenerator is not stable.
    svn merge --ignore-ancestry -c 6486 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6495 was merged into this branch
  Delete UiBinder's temporary files on exit
    svn merge --ignore-ancestry -c 6495 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6501:6503 was merged into this branch
  Move Plural Forms example to Showcase and delete I18N sample.
    svn merge --ignore-ancestry -r6501:6503 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6504-6506 was merged into this branch
  Improve performance of ClientBundle code generation
    svn merge --ignore-ancestry -c 6504,6505,6506 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6512 was merged into this branch
  JUnitShell incorrectly computed numClients due to out-of-order execution
    svn merge --ignore-ancestry -c 6512 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6515 was merged into this branch
  Bugfix in JavaToJavaScriptCompiler where it assumes PropertyOracle#getSelectionProperty can return null
    svn merge --ignore-ancestry -c 6515 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6517 was merged into this branch
  Ensure MhtmlClientBundleGenerator#createResourceContext generates unique strong names
    svn merge --ignore-ancestry -c 6517 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6519 was merged into this branch
  Flipping DisclosurePanel image in RTL
    svn merge --ignore-ancestry -c 6519 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6524 was merged into this branch
  Deprecate panels that have LayoutPanel alternatives
    svn merge --ignore-ancestry -c 6524 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6532 was merged into this branch
  Fixes a very obscure bug in ControlFlowAnalyzer.
    svn merge --ignore-ancestry -c6532 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6472, @6476, @6523, @6536 were merged into this branch
  Update the collection of tests that are ignored on HtmlUnit to reflect HtmlUnit update to 2.7-snapshot (6472)
  Updated Htmlunit to HtmlUnit (uppercase U) (6475)
  Adjust test timeout value based on Batching Strategy (6523)
  Remove all enqueued JS jobs during a module transition -- HtmlUnit plugin (r6536)
  svn merge --ignore-ancestry -c 6472 https://google-web-toolkit.googlecode.com/svn/trunk/ .
  svn merge --ignore-ancestry -c 6476 https://google-web-toolkit.googlecode.com/svn/trunk/ . 
  svn merge --ignore-ancestry -c 6523 https://google-web-toolkit.googlecode.com/svn/trunk/ .
  svn merge --ignore-ancestry -c 6536 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6450 was merged into this branch
  Cleans up SOYC options
  svn merge --ignore-ancestry -c 6450 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6511 was merged into this branch
  IO improvements to DiskCache
  svn merge --ignore-ancestry -c 6511 -r6828:6835 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6543 was merged into this branch
  Fixes an NPE when a logged exception has a null stack trace as string.
  svn merge --ignore-ancestry -c 6543 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6547 was merged into this branch
  Fix various error reporting issues
  svn merge --ignore-ancestry -c 6547 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6550, 6552 were merged into this branch
  Move UiBinder test app into user/test
  svn merge --ignore-ancestry -r 6549:6552 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6554, 6555, 6556 were merged into this branch
  uibinder.sample -> uibinder.test, run parser tests, fix XMLElementTestWarnings
  svn merge --ignore-ancestry -r 6552:6556 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6559 was merged into this branch
  Modified the remote UI protocol to send an initialization message with the client id. 
  svn merge --ignore-ancestry -c 6559 http://google-web-toolkit.googlecode.com/svn/trunk/ .
  
trunk@6564 was merged into this branch
  Fixed script permissions for *Creator and benchmarkViewer
  svn merge -c 6564 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6570 was merged into this branch
  Revert r6456 because it was causing JUnitShell to wait indefinitely.
  svn merge --ignore-ancestry -c 6570 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6572 was merged into this branch
  Fixing the UiBinderTestApp
  svn merge --ignore-ancestry -c 6572 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6574 was merged into this branch
  Added -web option to test.nometa.remote ant target.
  svn merge --ignore-ancestry -c 6574 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6576 was merged into this branch
  Allows test args to be specified per compile type.
  svn merge --ignore-ancestry -c 6576 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6578 was merged into this branch with conflicts
  Deprecates ImageBundle and updates samples.
  Minor conflicts in Horizontal- and VerticalSplitPanels
  svn merge --ignore-ancestry -c 6578  https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6566 was merged into this branch
  Improve the error message for 'GWT.create(UiBInder.class)' (as opposed to a subclass of UiBinder).
  svn merge --ignore-ancestry -c 6566 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6583 was merged into this branch
  Setting overflow to auto when enabling scrolling.
  svn merge --ignore-ancestry -c 6583 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6510 was merged into this branch
  Fixing svn props on many java files where this was missing.
  svn merge --ignore-ancestry -c 6510 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6588 was merged into this branch
  Disabling some tests in ImageTest to work around synchronous onload in Chrome.
  svn merge --ignore-ancestry -c 6588 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6589 was merged into this branch
  First step toward attribute parsers moving to XMLElement, to fix field ref in custom parsers.
  svn merge --ignore-ancestry -c r6589   https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6589 was merged into this branch
  De-deprecate HandlerManager.removeHandler, resolves issue 3102
  svn merge --ignore-ancestry -c r6581   https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6592 was merged into this branch
  Propagate log message colors to lower-priority ancestors.
    svn merge --ignore-ancestry -c6592 \
      https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6596 was merged into this branch
  Fix DockLayoutPanelParser and StackLayoutPanelParser
  svn merge --ignore-ancestry -c 6596 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6598 was merged into this branch
  Introduces EnumAttributeParser
  svn merge --ignore-ancestry -c 6598 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6600 was merged into this branch
  Enable good old VerticalAlignmentConstantParser
  svn merge --ignore-ancestry -c 6600 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6446 was merged into this branch
  Check for @GwtTransient annotation when checking for transient fields in the RPC subsystem.
  svn merge --ignore-ancestry -c 6446 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6604 was merged into this branch
  Fix deRPC with ciruclar references through CustomFieldSerializers
  svn merge --ignore-ancestry -c 6604 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6606 was merged into this branch
  Make ClientBundle and MhtmlResourceContext generators emit stable output.
  svn merge --ignore-ancestry -c 6606 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6611 was merged into this branch
  Fix accidentally extended timeout in JUnitShell
  svn merge --ignore-ancestry -c 6611 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6613 was merged into this branch
  Fix checkstyle warnings
  svn merge --ignore-ancestry -c 6613 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6618 was merged into this branch
  Support more structured GWT versions.
    svn merge --ignore-ancestry -c6618 \
      https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6441 was merged into this branch
  Add a 'sessionId' field to GWT lightweight metrics events
  svn merge --ignore-ancestry -c 6441 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6580 was merged into this branch
  Implement a -standardsMode flag for junit tests
  svn merge --ignore-ancestry -c 6580 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6625 was merged into this branch
  Avoid Arrays.copyOf since that was added in JDK1.6.
    svn merge --ignore-ancestry -c6625 \
      https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6612 was merged into this branch
  Checkstyle fixes in UiBinder tests
  svn merge --ignore-ancestry -c r6612 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6632, 6633 were merged into this branch
  Make the alignment parsers field ref friendly, Makes User depend upon UiBinder
  svn merge --ignore-ancestry -r 6631:6633 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6468 was merged into this branch
  Fix warnings
  svn merge --ignore-ancestry -c 6468 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6520 was merged into this branch
  Fix javadoc tag errors
  svn merge --ignore-ancestry -c 6520 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6609 was merged into this branch
  Avoid calling overridable methods from constructors to avoid subclassing glitches
  svn merge --ignore-ancestry -c 6609 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6642 was merged into this branch
  Clean up argument handlers for DevMode et al.
  svn merge --ignore-ancestry -c 6642 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6646 was merged into this branch
  Add names to test targets so we know which one failed.
  svn merge --ignore-ancestry -c 6646 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6645 was merged into this branch
  Redundant HasText decls. confuse UiBinder
  svn merge --ignore-ancestry -c 6645 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6652 was merged into this branch
  CompiledClasses now compute local class status from JDT.
  svn merge --ignore-ancestry -c6652 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6653 was merged into this branch
  XMLElement owns parsing
  svn merge --ignore-ancestry -c 6653 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6655 was merged into this branch
  Introduces JUnitShell argument -testMethodTimeout
  svn merge --ignore-ancestry -c 6655 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6656 was merged into this branch
  Disabling another image test associated with issue 862.
  svn merge --ignore-ancestry -c 6656 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk c6657-c6660 were merged into this branch
  Extracts CompilationStateTestBase from CompilationStateTest to reuse.
  Better failure messages for UnitTestTreeLogger on collections.
  Adds a Throwable unit to JavaResourceBase.
  Renames CompiledClass.getBinaryName() -> CompiledClass.getInternalName().
  svn merge --ignore-ancestry -r6656:6660 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6663 was merged into this branch
  Fix an ordering problem in SwingTreeLogger.
    svn merge --ignore-ancestry -c6663 \
      https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6666 was merged into this branch
  Increasing timeouts of RPC tests.
  svn merge --ignore-ancestry -c 6666 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6669,6670 was merged into the branch
  Hosted mode fixes for SingleJsoImpl
  svn merge --ignore-ancestry -c6669,6670 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6674 was merged into the branch
  Fix dates that fall into non-existent time ranges due to daylight savings
  svn merge --ignore-ancestry -c 6674 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6643, 6671 were merged into this branch
  Better error handling in DockLayoutPanelParser, restore XMLElemTest
  svn merge --ignore-ancestry -c 6643 https://google-web-toolkit.googlecode.com/svn/trunk .
  svn merge --ignore-ancestry -c 6671 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6684 was merged into this branch
  Make UiBinderTest#testCustomButtonParser work on IE, fix build
  svn merge --ignore-ancestry -c r6684 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6687 was merged into this branch
  Adds the infrastructure to re-run a test, if it failed. Useful for HtmlUnit which can be flaky sometimes. 
  svn merge --ignore-ancestry -c r6687 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6689 was merged into this branch
  Adds the remote browser id to JUnitShell output even if there is only one.
  svn merge --ignore-ancestry -c r6689 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6691 was merged into this branch
  Add various ways of launching a browser for HelpInfo links, add support for
  changing the prefix for those links and better formatting of them, cleanup
  comments.

    svn merge --ignore-ancestry -c6691 \
      https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6693 was merged into this branch
  Treat @DefaultLocale as equivalent to "default" when determining preference
  order.

    svn merge --ignore-ancestry -c6693 \
      https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6483 was merged into this branch
  Use 'devMode' instead of 'hosted' in the ant files for the samples
  svn merge --ignore-ancestry -c 6483 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6460 was merged into this branch
  Prevent parallel javac compiles when running tests in parallel.
  svn merge --ignore-ancestry -c r6460 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6514 was merged into this branch
  Code cleanup forCompositeTreeLogger, AbstractTreeLogger
  svn merge --ignore-ancestry -c 6514 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6616 was merged into this branch
  Clarify JsniCollector.SourceCache comment
  svn merge --ignore-ancestry -c 6616 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6707 was merged into this branch
  Show which browser failed when a browser dies a mysterious death.
  svn merge --ignore-ancestry -c 6707 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6696-6702 were merged into this branch
  Give transient generated units a real source location & precompute hash while source is available
  Slick trick with CompiledClass source location allows a much looser coupling of compilation unit validation code
  Looser coupling for ArtificialRescueChecker
  @Deprecate Resource.getURL() which isn't generally safe, and removes all overrides
  Removing lots of old, unneeded code from DevMode hierarchy
  TypeOracle.sort methods should be static
  ModuleContext should not create a zillion TypeOracles
  svn merge --ignore-ancestry -r6695:6702 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6513 was merged into this branch
  Remove two unused imports
  svn merge --ignore-ancestry -c 6513 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6714 was merged into this branch
  Fix DockLayoutPanelParser bad code gen
  svn merge --ignore-ancestry -c r6714 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6714 was merged into this branch
  Centralize a few standard MockJavaResources
  svn merge --ignore-ancestry -c r6716 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6718 was merged into this branch
  Don't log UnableToCompleteException stack traces
  svn merge --ignore-ancestry -c 6718 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6720 was merged into this branch
  Move xhtml.ent to its new home
  svn merge --ignore-ancestry -c 6720 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6722 was merged into this branch
  Send UiBinder's xml logging to the right place
  svn merge --ignore-ancestry -c 6722 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6546 was merged into this branch
  Fixes an overly long filename in a compile report
  svn merge --ignore-ancestry -c 6546 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6730 was merged into this branch
   Adds the needsAttention flag to the remote UI protocol.
   svn merge --ignore-ancestry -c 6730 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6732 was merged into this branch
   Change JUnit -standardsMode flag to -XstandardsMode and mark it as experimental and undocumented.
   svn merge --ignore-ancestry -c 6732 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6734 was merged into this branch
   Adds a -Xtries command line argument. 
   svn merge --ignore-ancestry -c 6734 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6721 was merged into this branch
  Fix GenerateCssAst hosted-mode refresh behavior
  svn merge --ignore-ancestry -c 6721 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@5569,6736 was merged into this branch
  Enhance JsStaticEval to handle addition/concatenation.
  svn merge --ignore-ancestry -c6569,6736 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6739 was merged into this branch
  Do not attempt to re-run the test if an exception is of type/sub-type java.lang.Error 
  svn merge --ignore-ancestry -c6739 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6743 was merged into this branch
  Fixed a breaking test. 
  svn merge --ignore-ancestry -c6743 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6746 was merged into this branch
  Fix possible infinite loop in hosted.html (issue 4199).

    svn merge --ignore-ancestry -c6746 \
      https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6743 was merged into this branch
  Reverts tweaks to retry logic due to broken tests.
  svn merge --ignore-ancestry -c 6747 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6751 was merged into this branch
  Re-introduces 6743 and a small patch.
  svn merge --ignore-ancestry -c 6751 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6750 was merged into this branch
  Makes UiBinder able to deal with mixed content in ui:msg
  svn merge --ignore-ancestry -c 6750 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6753 was merged into this branch
  finish isolating concrete AttributeParser implementations from the rest of the code base
  svn merge --ignore-ancestry -c 6753 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6762 was merged into this branch
   Changes to the Message wire format
   svn merge --ignore-ancestry -c 6762 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6767 was merged into this branch
   Make Server and Main TreeLoggers log to Console when using RemoteUI 
   svn merge --ignore-ancestry -c 6767 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6770 was merged into this branch
   Cleaning up the mail sample, adding new styles, and moving most images into @sprite CssResource.
   svn merge --ignore-ancestry -c 6770 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6772 was merged into this branch
   Remove an outdated reference to the compile/browse button
   svn merge --ignore-ancestry -c 6772 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6774 was merged into this branch
   Hello DialogBoxParser, stricter parsing
   svn merge --ignore-ancestry -c 6774 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6774 was merged into this branch
  Comment tweaks on xhtml.ent
  svn merge --ignore-ancestry -c 6776 https://google-web-toolkit.googlecode.com/svn/trunk .
  
trunk@6793 was merged into this branch
  svn merge -c 6793 https://google-web-toolkit.googlecode.com/svn/trunk .
  
trunk@6796 was merged into this branch
  svn merge -c 6796 https://google-web-toolkit.googlecode.com/svn/trunk .
  
trunk@6798, 6799, 6800 were merged into this branch
  svn merge -r 6797:6800 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6804 was merged into this branch
   Fixes a problem where the DevMode server was hanging when the remote UI was shut down in an unclean fashion
   svn merge --ignore-ancestry -c 6804 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6782,6783,6784,6785 were merged into this branch
  -- Format ApiCompatibilityChecker
  -- Big refactoring of test code and api-checker to remove dependencies on
CompilationUnit. This is in preparation for more refactoring, which will make
CompilationUnit stateless outputs rather than stateful inputs/outputs.
  -- TypeOracle now builds from bytecode instead of JDT structures (part of
Instant Hosted Mode work).
  -- Simplify resolution of annotations in TypeOracle. Annotaions must always
use the context classloader, which contains all user data, because that's the
same classloader that Generators run in.  There is also no need to resolve them
since they may be binary-only.
  for i in 6782 6783 6784 6785 ; do svn merge --ignore-ancestry -c $i https://google-web-toolkit.googlecode.com/svn/trunk .; done

trunk@6809 was merged into this branch
 Fixes custom PluralRule classes that are nested
    svn merge --ignore-ancestry -c6809 \
      https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6789,6790,6791 were merged into this branch
  -- Shuffles some test classes around; adds missing tests to
JavaCompilationSuite convenience test suite.
  -- Model Enum.valueOf and Enum.values in TypeOracle since they are an
implicit part of the language.
  -- Generators now exist per-StandardGeneratorContext to avoid concurrency
issues.
  for i in 6789 6790 6791 ; do svn merge --ignore-ancestry -c $i https://google-web-toolkit.googlecode.com/svn/trunk .; done

trunk@6814,6815 was merged into this branch
  Fix null.nullMethod() in DynaTable sample app due to null-tightened field
  svn merge --ignore-ancestry -c6814,6815  https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6810,6813 were merged into this branch
  keep Ie7 users from paying the AlphaImageLoader penalty
  proper behavior of g:header and g:customHeader in StackLayoutPanelparser
  layout panel units default to PX (instead of NPE, ahem)
  svn merge --ignore-ancestry -c 6810 https://google-web-toolkit.googlecode.com/svn/trunk .
  svn merge --ignore-ancestry -c 6813 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6825 was merged into this branch
 Fixes an NPE when resolving a type signature with an unknown class.
    svn merge --ignore-ancestry -c6825 \
      https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6836 was merged into this branch
 The UiBinder XSDs for the ui: prefix and g: prefix.  
    svn merge --ignore-ancestry -c6836 \
      http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6839 was merged into this branch
  Disable MHTML support for GWT 2.0, there are too many sharp edges.
  svn merge --ignore-ancestry -c6839 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk c6829-c6835 were merged into this branch
  Remove spammy logging from SoycTest.
  Adding some useful PerfLogger messages.
  Moving several files from com.google.gwt.dev.javac.impl -> com.google.gwt.dev.javac
  Format GenerateJavaAST
  Refactors JSNI parsing/error reporting from GenerateJavaAST to JsniCollector.
  Major refactor of CompilationState and associated classes to fix concurrent refresh problems.
  r6834 broke the -gen option since GeneratedUnitWithFile now requires the DiskCache to be available.
    svn merge --ignore-ancestry -r6828:6835 \
      https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6842 was merged into this branch
  Fix external issue 4140: Javascript deserialization error on JPA-annotated classes
  svn merge --ignore-ancestry -c6842 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6845 was merged into this branch
  Fixes a bug where using GWT 2.0 tip, and GAE 1.2.6 blows up with a Bus error.  It is not entirely clear why this happens but the JVM shutsdown with no real feedback.
  svn merge --ignore-ancestry -c6845 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6803 was merged into this branch
  Increases the timeout of HttpSuite tests to 15 seconds.
  svn merge --ignore-ancestry -c6803 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6851 was merged into this branch
  Fixes some Scheduler bugs and adds a test case.
  svn merge --ignore-ancestry -c6851 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk c6854-c6857 were merged into this branch
  Make AnnotationProxyFactory store an unmofiable minimal map.
  FindJsniRefVisitor can no longer beSloppy().
  Removes OptionCompilationStateRetained in favor of a new GC strategy.
  Sandboxes AbstractCompiler so that the backreference can be detached from internal JDT types.
    svn merge --ignore-ancestry -r6853:6857 \
      https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6859 was merged into this branch
  Close the socket used by the MessageTransport class if we experience any errors.  Included Scott's assertion message improvements from http://gwt-code-
reviews.appspot.com/100805.
    svn merge --ignore-ancestry -c6859 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6864 was merged into this branch
  Fixes a unit testing break introduced by r6859.
    svn merge --ignore-ancestry -c6864 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6867 was merged into this branch
  {Field.references} are now validated.
  svn merge --ignore-ancestry -c 6867 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6871 was merged into this branch
 Fix a problem getting real argument names from generic methods.
    svn merge --ignore-ancestry -c6871 \
      http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6872 was merged into this branch
 Fix a problem with local classes.
    svn merge --ignore-ancestry -c6872 \
      http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6876 was merged into this branch
 Synchronize ModuleDef#getResourceOracle() to fix an issue where multiple sessions clobber each other
    svn merge --ignore-ancestry -c6876 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6880 was merged into this branch
 Adds a start() method to MessageTransport
    svn merge --ignore-ancestry -c6880 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6884 was merged into this branch
 Synchronizing OophmSessionHandler#loadModule() to prevent multiple modules from loading at the same time.
    svn merge --ignore-ancestry -c6884 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6883 was merged into this branch
 Fixed stupid style error in Mail's stack panel headers.
    svn merge --ignore-ancestry -c6883 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6852 was merged into this branch
 Make RunStyleSelenium more extensible.
    svn merge --ignore-ancestry -c6852 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6889 was merged into this branch
  Fix Issue 4045: cannot start in Turkish locale
    svn merge --ignore-ancestry -c6889 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6891 was merged into this branch
 Made missing plugin iframe in hosted.html prettier
    svn merge -c 6891 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6893 was merged into this branch
 Updated dev mode prompt URL to refer to "gwt.codesvr" instead of "gwt.hosted"
    svn merge --ignore-ancestry -c 6893 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6896 was merged into this branch
 Update MissingPlugin app with license and new IE download URL
    svn merge --ignore-ancestry -c6896 \
      http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6898 was merged into this branch
 Serialize generator runs.
    svn merge --ignore-ancestry -c6898 \
      http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6900 was merged into this branch
 Add missing files from MissingPlugin, improve build.xml integration
    svn merge --ignore-ancestry -c6900 \
      http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6903 was merged into this branch
  Updates release notes for GWT 2.0 RC
    svn merge --ignore-ancestry -c6903 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6895 was merged into this branch
  Updating the Gwt Developer Plugin for IE to use the latest terminology
    svn merge --ignore-ancestry -c6895 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6907 was merged into this branch
  Add registry keys to IE plugin installer
    svn merge --ignore-ancestry -c6907 http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6909 was merged into this branhc
 Fixes JSNI uses of JSOs as maps in Chrome DevMode.
    svn merge --ignore-ancestry -c6909 \
      https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6911 was merged into this branch
  gwt-user should not reference the dev collections, this causes server failures.
    svn merge --ignore-ancestry -c6911 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6913 was merged into this branch
  UiBinder attribute parsing was pretty much working by accident
    svn merge --ignore-ancestry -c 6913 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk c6917-c6919 were merged into this branch
  Fixes a race condition creating StandardGeneratorContext's diskCache.
  Remove unused method from ModuleSpace.
  Fixes workDir directory contention between multiple concurrent hosted mode sessions.
    svn merge --ignore-ancestry -r6916:6919 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6921,6922 were merged into this branch
  Fixes a memory leak in XMLHttpRequest.
  svn merge --ignore-ancestry -c6921,6922 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6923 were merged into this branch
  Allows path to executable in RunStyleSelenium.
  svn merge --ignore-ancestry -c6923 https://google-web-toolkit.googlecode.com/svn/trunk .

trunk@6926 was merged into this branch
 Fix thread safety issues in GwtLocaleFactoryImpl and LocaleUtils.
    svn merge --ignore-ancestry -c6926 \
      https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6930 was merged into this branch
  Update the generated README.txt, created when the webAppCreator script is used.
    svn merge --ignore-ancestry -c6930 https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6933 was merged into this branch
 Update MissingPlugin app and associated legacy HTML page.
    svn merge --ignore-ancestry -c6933 \
      https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6937 was merged into this branch
 Minor tweaks to MissingPlugin. Updates IE download plugin. Style tweaks.
    svn merge -c6937 --ignore-ancestry http://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk@6939 was merged into this branch
 Update MissingPlugin app version.
    svn merge --ignore-ancestry -c6939 \
      https://google-web-toolkit.googlecode.com/svn/trunk/ .

trunk c6943-c6949 were merged into this branch
  Sort & format some junit files.
  Cleanup of CompileStrategy which no longer cares about RunStyle at all.
  RunStyleHtmlUnit was not setting the number of clients.
  UnitShell should never refresh modules; it's not necesary and can lead to race conditions.
  Cleanup of ModuleDef loading.
  GWTShell now reuses dev mode linking code to populate its generated resources directory.
    svn merge --ignore-ancestry -r6942:6949 https://google-web-toolkit.googlecode.com/svn/trunk/ .