commit | 6cd61e9c0912fc092d0ac5058ff8ce8ffec338ae | [log] [tgz] |
---|---|---|
author | scottb@google.com <scottb@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> | Fri Jan 16 19:50:20 2009 +0000 |
committer | scottb@google.com <scottb@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> | Fri Jan 16 19:50:20 2009 +0000 |
tree | c1cf6e1815dded54a4e5440f45f7738e2800a86d | |
parent | a87b27da4998ed3c24a64463833c9da971776a91 [diff] |
Merging releases/1.6@4385:4459 into trunk. svn merge --accept=postpone -r4385:4459 https://google-web-toolkit.googlecode.com/svn/releases/1.6 . I had to manually merge the following things: - Consistent line endings for ProxyCreator; 1.6@4388 - PermutationWorkerFactory actually fails compiles on error; 1.6@4405 - CompilingClassLoader CompilationUnit-based JSNI injection (for Emma); 1.6@4446 - Pruner sort & format; 1.6@4458 git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@4488 8db76d5a-ed1c-0410-87a9-c151d255dfc7