diff options
| author | Paul Phillips <paulp@improving.org> | 2012-03-14 12:27:53 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-03-14 12:27:53 -0700 |
| commit | a127aae2a5fbae146ea81e470541209436222970 (patch) | |
| tree | 75b8a7d3362896fd6562eac321b239326296b48a /test/files/run/primitive-sigs-2.check | |
| parent | 0c9ffe55c774de261d32f36cc29b954638e86574 (diff) | |
| parent | 5b562d4e7e451156236b48b3591db980a5691f8d (diff) | |
| download | scala-a127aae2a5fbae146ea81e470541209436222970.tar.gz scala-a127aae2a5fbae146ea81e470541209436222970.tar.bz2 scala-a127aae2a5fbae146ea81e470541209436222970.zip | |
Merge branch 'merge-inline' of /scratch/trunk3 into develop
Diffstat (limited to 'test/files/run/primitive-sigs-2.check')
| -rw-r--r-- | test/files/run/primitive-sigs-2.check | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/run/primitive-sigs-2.check b/test/files/run/primitive-sigs-2.check index c69d1b54a6..0af1434cea 100644 --- a/test/files/run/primitive-sigs-2.check +++ b/test/files/run/primitive-sigs-2.check @@ -1,4 +1,4 @@ -T<java.lang.Object> interface scala.ScalaObject +T<java.lang.Object> class java.lang.Object List(A, char, class java.lang.Object) a public <T> java.lang.Object Arr.arr4(java.lang.Object[],scala.reflect.Manifest<T>) |