summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorJames Iry <jamesiry@gmail.com>2013-11-12 15:56:32 -0800
committerJames Iry <jamesiry@gmail.com>2013-11-12 15:56:32 -0800
commit5cef951d0d230cfecd1138a0cc18643052437100 (patch)
treec2a8d159f78357dfd14295aaebd999140d7f6ab7 /.gitattributes
parentd2cee3a5e1d26ba27fd7912d48b1e7af0beb844a (diff)
parentaac015a84c2d64ce485078a5a854bc7533e2fc7b (diff)
downloadscala-5cef951d0d230cfecd1138a0cc18643052437100.tar.gz
scala-5cef951d0d230cfecd1138a0cc18643052437100.tar.bz2
scala-5cef951d0d230cfecd1138a0cc18643052437100.zip
Merge pull request #3111 from phaller/issue/7958
SI-7958 Deprecate methods `future` and `promise` in the `scala.concurren...
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions