upgrade to Scala 2.10.3-RC2
upgrade to Scala 2.10.3-RC2
oops fix mistake in HubNet doc
3D dictionary fix: ox/y/zcor have double underscores
upgrade to Scala 2.10.3-RC3
upgrade to Scala 2.10.3-RC3
Merge branch 'headless' into headless-scala-2.10.3
Merge remote-tracking branch 'origin/master' into scala-2.10.3
Updating docs regarding histogram auto scaling
upgrade ScalaTest to 2.0.RC1
upgrade to Scala 2.10.3 final
upgrade to Scala 2.10.3 final
Merge remote-tracking branch 'origin/headless' into headless-scala-2.10.3
Merge pull request #445 from NetLogo/headless-scala-2.10.3

upgrade to Scala 2.10.3 final (headless branch)
Merge pull request #444 from NetLogo/scala-2.10.3

upgrade to Scala 2.10.3
Merge commit '122a67b4076eda198c88ed5a304f6e162d689abd'

Conflicts:
	headless/src/test/org/nlogo/parse/ExpressionParserTests.scala
Merge commit '935cf7b1f1da98be74e216d0877f7ffd4556eb97'

Conflicts:
	headless/src/main/org/nlogo/parse/ExpressionParser.scala
	src/main/org/nlogo/compiler/ConstantParser.scala
	src/test/org/nlogo/compiler/ConstantParserTests.scala
	test/benchdumps/CA1D.txt
	test/benchdumps/GasLabCirc.txt
	test/benchdumps/GasLabNew.txt
	test/benchdumps/Ising.txt
Merge commit 'db092347a2189757947f1ab899f19378103ca9ce'

Conflicts:
	src/main/org/nlogo/agent/ArrayAgentSet.java
Merge remote-tracking branch 'origin/5.0.x'

Conflicts:
	docs/applet.html
	docs/hubnet.html
Merge remote-tracking branch 'origin/master' into core

Conflicts:
	docs/3d.html
	docs/dictionary.html
	docs/faq.html
	docs/hubnet.html
	docs/programming.html
	headless/src/test/org/nlogo/parse/LiteralParserTests.scala