diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-09-12 10:44:52 +0200 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-09-12 10:44:52 +0200 |
| commit | d5ce3de30e2cb291ec83be00f26b7aced8b8a873 (patch) | |
| tree | 2ebf64420d1d6a92575c754e0911c6d7cf1bc989 /test/instrumented/boxes.patch | |
| parent | f4ccefe6a41897e9aa5fab72d86d9b481785baec (diff) | |
| parent | 43dcfd07610f0b17906159c79c1cb1611be14f82 (diff) | |
| download | scala-d5ce3de30e2cb291ec83be00f26b7aced8b8a873.tar.gz scala-d5ce3de30e2cb291ec83be00f26b7aced8b8a873.tar.bz2 scala-d5ce3de30e2cb291ec83be00f26b7aced8b8a873.zip | |
Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x-to-2.10.3
Diffstat (limited to 'test/instrumented/boxes.patch')
| -rw-r--r-- | test/instrumented/boxes.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/instrumented/boxes.patch b/test/instrumented/boxes.patch index 6c5ff23f9f..2bb3243221 100644 --- a/test/instrumented/boxes.patch +++ b/test/instrumented/boxes.patch @@ -1,5 +1,5 @@ 9c9 -< +< --- > /* INSTRUMENTED VERSION */ 51a52,59 |