scala - The Scala programming language

	Commit message (Collapse)	Author	Age	Files	Lines
*	Remove further references to forkjoin	Jason Zaugg	2015-07-15	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use j.u.c.Forkjoin directly in active and disabled tests Remove bitrotted benchmarks code I was going to update these to use `java.util.concurrent.ForkJoin` directly, instead of our deprecated stubs. But most of them don't compile anymore (e.g. scala.testing.Benchmark has been removed, ClassTag imports missing). While I'm all for benchmarks, we should have large swathes of code checked in that isn't at compiled and run automatically. I'm happy to help someone resurrect these in a suitable form.
*	Merge commit '1b7e660' into merge-2.11-may-12	Lukas Rytz	2015-05-12	1	-16/+7
\|\
\| *	Update intellij project files for IDEA 14.1 and latest Scala plugin	Lukas Rytz	2015-05-01	1	-16/+7
\| \| \| \| \| \| \| \| \| \|	Removes the src/intellij-14 folder and moves everything back to src/intellij.
* \|	Remove scala.actors and the actors migration module dependency	Lukas Rytz	2015-04-23	1	-1/+0
\|/
*	IntelliJ project files	Lukas Rytz	2014-05-02	1	-6/+16
\| \| \| \|	Fixes compilation within IDEA. Allows compiling and running JUnit tests directly withing the IDE.
*	Scrubbing up the IntelliJ Config	Jason Zaugg	2013-07-29	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \|	- Add recently sprouted modules (xml and parser-combinators) - Replace some of the documentation with a setup script - Update Ant build to copy Maven sourced JARs to ./build/deps. These are included in the IntelliJ classpath. - Define the library for Ant at the project level based on ./lib, rather than asking the user to define global library. - Disable Type Aware Highlighting by default. IntelliJ now can build everything within the IDE with CTRL-F9.
*	Merge commit 'refs/pull/1718/head' into merge-msil-genjvm-delete	Paul Phillips	2012-12-06	1	-1/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* commit 'refs/pull/1718/head': Expunged the .net backend. Conflicts: build.detach.xml build.examples.xml build.xml project/Build.scala src/compiler/scala/tools/ant/Scalac.scala src/compiler/scala/tools/nsc/Global.scala src/compiler/scala/tools/nsc/settings/StandardScalaSettings.scala src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala src/compiler/scala/tools/nsc/transform/Mixin.scala src/intellij/compiler.iml.SAMPLE tools/buildcp
\| *	Expunged the .net backend.	Paul Phillips	2012-12-05	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It lives on in a branch born from this commit's parent. It's abrupt; no attempt is made to offer a "smooth transition" for the serious msil userbase, population zero. If anyone feels very strongly that such a transition is necessary, I will be happy to talk you into feeling differently.
* \|	SI-6769 Removes GenJVM backend	James Iry	2012-12-05	1	-1/+0
\|/ \| \| \| \|	Get rid of GenJVM and everything that refers to it. Also get rid of GenAndroid since it's dead code that refers to GenJVM.
*	updated intellij project files	Lukas Rytz	2012-07-16	1	-3/+7
\|
*	An IntelliJ module for test files.	Jason Zaugg	2012-05-17	1	-0/+16
	This enables resolve, autocompletion and the usual goodness when editing tests. Also removes the sample configuration for the defunct dbc module.