Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'github-scalagwt/master'

Conflicts:
	src/com/google/gwt/sample/gwtdlx/client/GwtDlx.scala
  • Loading branch information...
commit 309f133a4e1815e3612fcde1e97784d1a0ec25e9 2 parents 4f619e8 + b649416
@gkossakowski gkossakowski authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  build.xml
View
2  build.xml
@@ -3,7 +3,7 @@
<!-- Arguments -style PRETTY or -logLevel DEBUG to gwtc and devmode targets -->
<property name="gwt.args" value="-draftCompile -ea -style pretty -logLevel TRACE" />
<property name="gwt.dev.args" value="-logLevel TRACE" />
- <property name="scala.args" value="-g:notailcalls -Xplugin:${basedir}/lib/scala/factorymanifests.jar -Xplugin:lib/scala/continuations.jar -P:continuations:enable -Yjribble-text"/>
+ <property name="scala.args" value="-g:notailcalls -Xplugin:lib/scala/continuations.jar -P:continuations:enable -Yjribble-text"/>
<path id="scala.class.path">
<fileset dir="lib/scala">
Please sign in to comment.
Something went wrong with that request. Please try again.