summaryrefslogtreecommitdiff
path: root/build.xml
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@typesafe.com>2013-01-27 22:36:35 -0800
committerAdriaan Moors <adriaan.moors@typesafe.com>2013-01-27 22:36:35 -0800
commitf7b5b312ca5dd1333245d8174a8dbadc89bd40fc (patch)
tree1f2793fdb066dedf38468e2dcbab5865c0d352d6 /build.xml
parent53d4ec0187416c72cd1f25d24c5811c7fd6574db (diff)
parent48970634271b8e231991dcd053134e1932d55e1d (diff)
downloadscala-f7b5b312ca5dd1333245d8174a8dbadc89bd40fc.tar.gz
scala-f7b5b312ca5dd1333245d8174a8dbadc89bd40fc.tar.bz2
scala-f7b5b312ca5dd1333245d8174a8dbadc89bd40fc.zip
Merge pull request #1962 from phaller/issue/6932-2.9.xv2.9.3-RC2v2.9.3
Backport of SI-6932 to 2.9.x
Diffstat (limited to 'build.xml')
-rw-r--r--build.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/build.xml b/build.xml
index 9df0c98c1a..7489955cc7 100644
--- a/build.xml
+++ b/build.xml
@@ -401,6 +401,7 @@ LOCAL REFERENCE BUILD (LOCKER)
<exclude name="scala/concurrent/Promise.scala"/>
<exclude name="scala/concurrent/ExecutionContext.scala"/>
<exclude name="scala/concurrent/BlockContext.scala"/>
+ <exclude name="scala/concurrent/BatchingExecutor.scala"/>
<exclude name="scala/concurrent/impl/Future.scala"/>
<exclude name="scala/concurrent/impl/Promise.scala"/>
<exclude name="scala/concurrent/impl/ExecutionContextImpl.scala"/>