Author: desruisseaux
Date: Mon Jan 7 03:40:19 2013
New Revision: 1429661
URL: http://svn.apache.org/viewvc?rev=1429661&view=rev
Log:
Merge from the JDK6 branch.
Modified:
sis/trunk/ (props changed)
sis/trunk/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
Propchange: sis/trunk/
------------------------------------------------------------------------------
Merged /sis/branches/JDK7:r1429548-1429659
Merged /sis/branches/JDK6:r1429550-1429660
Modified:
sis/trunk/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
URL:
http://svn.apache.org/viewvc/sis/trunk/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java?rev=1429661&r1=1429660&r2=1429661&view=diff
==============================================================================
---
sis/trunk/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
(original)
+++
sis/trunk/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java
Mon Jan 7 03:40:19 2013
@@ -38,7 +38,7 @@ import static org.apache.sis.util.collec
* @module
*/
@DependsOn({
- DefaultTreeTableTest.class,
+ DefaultTreeTableTest.class
})
public final strictfp class TreeTablesTest extends TestCase {
/**
