diff options
| author | Seth Tisue <seth@tisue.net> | 2015-08-20 16:06:13 -0400 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2015-08-20 16:15:17 -0400 |
| commit | ded2d4f2e613aad6670b3e5dccbab0feb711b18b (patch) | |
| tree | 665fc16d4932a6d8625fe28ae87c100bb1ee96c1 /test/files/t8449 | |
| parent | cd77e23b76af8538ed7e2c5c90e7845582dff460 (diff) | |
| parent | a77e34e4b1ed445368b8412dbbf07340554afd57 (diff) | |
| download | scala-ded2d4f2e613aad6670b3e5dccbab0feb711b18b.tar.gz scala-ded2d4f2e613aad6670b3e5dccbab0feb711b18b.tar.bz2 scala-ded2d4f2e613aad6670b3e5dccbab0feb711b18b.zip | |
Merge remote-tracking branch 'origin/2.11.x' into 2.12.x
all conflicts were because the changes changed code that
doesn't exist anymore in 2.12; they were resolved with
`git checkout --ours`
c201eac changed bincompat-forward.whitelist.conf but
I dropped the change in this merge because it refers
to AbstractPromise which no longer exists in 2.12
Diffstat (limited to 'test/files/t8449')
0 files changed, 0 insertions, 0 deletions