Revision: 6712 Author: [email protected] Date: Thu Nov 5 11:56:01 2009 Log: Merge tr...@6513 into this branch Remove two unused imports svn merge --ignore-ancestry -c 6513 https://google-web-toolkit.googlecode.com/svn/trunk .
http://code.google.com/p/google-web-toolkit/source/detail?r=6712 Modified: /releases/2.0/branch-info.txt /releases/2.0/dev/core/test/com/google/gwt/core/ext/typeinfo/test/PrimitiveValuesAnnotation.java /releases/2.0/user/test/org/apache/commons/collections/TestMap.java ======================================= --- /releases/2.0/branch-info.txt Thu Nov 5 11:49:42 2009 +++ /releases/2.0/branch-info.txt Thu Nov 5 11:56:01 2009 @@ -363,10 +363,9 @@ Clarify JsniCollector.SourceCache comment svn merge --ignore-ancestry -c 6616 https://google-web-toolkit.googlecode.com/svn/trunk . - tr...@6707 was merged into this branch Show which browser failed when a browser dies a mysterious death. - svn merge --ignore-ancestry -c r6707 https://google-web-toolkit.googlecode.com/svn/trunk . + svn merge --ignore-ancestry -c 6707 https://google-web-toolkit.googlecode.com/svn/trunk . tr...@6696-6702 were merged into this branch Give transient generated units a real source location & precompute hash while source is available @@ -378,3 +377,6 @@ ModuleContext should not create a zillion TypeOracles svn merge --ignore-ancestry -r6695:6702 https://google-web-toolkit.googlecode.com/svn/trunk . +tr...@6513 was merged into this branch + Remove two unused imports + svn merge --ignore-ancestry -c 6513 https://google-web-toolkit.googlecode.com/svn/trunk . ======================================= --- /releases/2.0/dev/core/test/com/google/gwt/core/ext/typeinfo/test/PrimitiveValuesAnnotation.java Thu Feb 7 07:18:12 2008 +++ /releases/2.0/dev/core/test/com/google/gwt/core/ext/typeinfo/test/PrimitiveValuesAnnotation.java Thu Nov 5 11:56:01 2009 @@ -15,7 +15,6 @@ */ package com.google.gwt.core.ext.typeinfo.test; -import java.io.Serializable; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; ======================================= --- /releases/2.0/user/test/org/apache/commons/collections/TestMap.java Wed Apr 2 16:22:58 2008 +++ /releases/2.0/user/test/org/apache/commons/collections/TestMap.java Thu Nov 5 11:56:01 2009 @@ -15,8 +15,6 @@ */ package org.apache.commons.collections; -import junit.framework.AssertionFailedError; - import java.util.Collection; import java.util.HashMap; import java.util.Iterator; --~--~---------~--~----~------------~-------~--~----~ http://groups.google.com/group/Google-Web-Toolkit-Contributors -~----------~----~----~----~------~----~------~--~---
