diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-12-11 19:42:33 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-12-11 19:42:33 +0100 |
| commit | e1c6dd965aa4249f715bbb2832df182cc5505853 (patch) | |
| tree | 840a092abc16563b9f83b6b3a24556ad91ba67e7 /build.xml | |
| parent | 18fd31d2b58e6e14cbd49d8e20ba05d05165eb4b (diff) | |
| parent | 0c927046dc5df974e6c39187107cf3548825282b (diff) | |
| download | scala-e1c6dd965aa4249f715bbb2832df182cc5505853.tar.gz scala-e1c6dd965aa4249f715bbb2832df182cc5505853.tar.bz2 scala-e1c6dd965aa4249f715bbb2832df182cc5505853.zip | |
Merge commit '0c92704' into merge/2.10.x-to-master
Conflicts:
bincompat-forward.whitelist.conf
src/interactive/scala/tools/nsc/interactive/Global.scala
test/files/presentation/scope-completion-2.check
test/files/presentation/scope-completion-3.check
test/files/presentation/scope-completion-import.check
Conflicts in the scope completion tests handled with the help
of @skyluc in https://github.com/scala/scala/pull/3264
Diffstat (limited to 'build.xml')
0 files changed, 0 insertions, 0 deletions