summaryrefslogtreecommitdiff
path: root/src/interactive/scala/tools/nsc/interactive/Global.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-05-01 15:33:30 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-05-01 15:33:30 +1000
commite596d1a65d81a81a54847d90d2d90be3ffbb3d92 (patch)
treed6c86e80b08b47271e65bccfe734e80bc531be8f /src/interactive/scala/tools/nsc/interactive/Global.scala
parent4210262867a541d4cbf0aaf2b06bedeef9520c2b (diff)
parent6a185e3c97b79716576725f1ecf0ba629e83951d (diff)
downloadscala-e596d1a65d81a81a54847d90d2d90be3ffbb3d92.tar.gz
scala-e596d1a65d81a81a54847d90d2d90be3ffbb3d92.tar.bz2
scala-e596d1a65d81a81a54847d90d2d90be3ffbb3d92.zip
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20150501
Diffstat (limited to 'src/interactive/scala/tools/nsc/interactive/Global.scala')
-rw-r--r--src/interactive/scala/tools/nsc/interactive/Global.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/interactive/scala/tools/nsc/interactive/Global.scala b/src/interactive/scala/tools/nsc/interactive/Global.scala
index b6290eb3d3..e79c1a01ab 100644
--- a/src/interactive/scala/tools/nsc/interactive/Global.scala
+++ b/src/interactive/scala/tools/nsc/interactive/Global.scala
@@ -304,7 +304,7 @@ class Global(settings: Settings, _reporter: Reporter, projectName: String = "")
private val NoResponse: Response[_] = new Response[Any]
/** The response that is currently pending, i.e. the compiler
- * is working on providing an asnwer for it.
+ * is working on providing an answer for it.
*/
private var pendingResponse: Response[_] = NoResponse