diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-11-06 15:07:08 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2012-11-06 15:07:08 -0800 |
| commit | fe86aedf4acbb16159c8036edeadbda0bd380771 (patch) | |
| tree | 27c00ec8e2a50815985c8f1d3bf4793e318c6a20 /src/asm | |
| parent | 9d265965294e65c8f20a027254042c9468af83d9 (diff) | |
| parent | a5714183d1a197f5b7b69306db6be28b2724bbb7 (diff) | |
| download | scala-fe86aedf4acbb16159c8036edeadbda0bd380771.tar.gz scala-fe86aedf4acbb16159c8036edeadbda0bd380771.tar.bz2 scala-fe86aedf4acbb16159c8036edeadbda0bd380771.zip | |
Merge pull request #1576 from paulp/merge-210
Merge 2.10.x/2.10.0-RC2 into master
Diffstat (limited to 'src/asm')
| -rw-r--r-- | src/asm/scala/tools/asm/CustomAttr.java | 2 | ||||
| -rw-r--r-- | src/asm/scala/tools/asm/util/SignatureChecker.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/asm/scala/tools/asm/CustomAttr.java b/src/asm/scala/tools/asm/CustomAttr.java index 5ecfd283d0..22b5d287b7 100644 --- a/src/asm/scala/tools/asm/CustomAttr.java +++ b/src/asm/scala/tools/asm/CustomAttr.java @@ -1,5 +1,5 @@ /* NSC -- new Scala compiler - * Copyright 2005-2012 LAMP/EPFL + * Copyright 2005-2013 LAMP/EPFL */ package scala.tools.asm; diff --git a/src/asm/scala/tools/asm/util/SignatureChecker.java b/src/asm/scala/tools/asm/util/SignatureChecker.java index 7b7eea4383..71f0d80027 100644 --- a/src/asm/scala/tools/asm/util/SignatureChecker.java +++ b/src/asm/scala/tools/asm/util/SignatureChecker.java @@ -1,5 +1,5 @@ /* NSC -- new Scala compiler - * Copyright 2005-2012 LAMP/EPFL + * Copyright 2005-2013 LAMP/EPFL */ package scala.tools.asm.util; |