| commit | 72e89ca9108bd7b42acb570c01326678dde896d6 | [log] [tgz] |
|---|---|---|
| author | scottb@google.com <scottb@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> | Fri Jan 16 20:03:26 2009 +0000 |
| committer | scottb@google.com <scottb@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> | Fri Jan 16 20:03:26 2009 +0000 |
| tree | b11253ba412357a6eecb11f37628399e609d4f4b | |
| parent | 82054d4d9e3d578c8ad8c0a225fd4d889622278b [diff] |
Backporting trunk conflict-resolution from r4488 merge. This change should not be merged up into trunk. git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4489 8db76d5a-ed1c-0410-87a9-c151d255dfc7