scala - The Scala programming language

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '2.10.x'	Adriaan Moors	2013-01-16	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/compiler/scala/tools/nsc/doc/Settings.scala src/compiler/scala/tools/nsc/interpreter/CompletionOutput.scala src/compiler/scala/tools/nsc/matching/Patterns.scala src/compiler/scala/tools/nsc/transform/UnCurry.scala src/compiler/scala/tools/nsc/typechecker/Infer.scala src/compiler/scala/tools/nsc/typechecker/PatternMatching.scala src/compiler/scala/tools/nsc/typechecker/Typers.scala src/reflect/scala/reflect/internal/settings/MutableSettings.scala src/reflect/scala/reflect/runtime/Settings.scala src/swing/scala/swing/SwingActor.scala src/swing/scala/swing/SwingWorker.scala test/files/run/t6955.scala
*	SI-5440 Test case for exhaustiveness check	Jason Zaugg	2013-01-13	1	-0/+5
	Reported against patmatclassic, working in virtpatmat.