scala - The Scala programming language

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge commit '9cdbe28' into merge/2.10.x-to-master	Jason Zaugg	2013-12-11	19	-850/+0
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: build.examples.xml build.xml docs/examples/actors/pingpong.scala docs/examples/fors.scala docs/examples/iterators.scala docs/examples/jolib/Ref.scala docs/examples/jolib/parallelOr.scala docs/examples/monads/callccInterpreter.scala docs/examples/monads/directInterpreter.scala docs/examples/monads/errorInterpreter.scala docs/examples/monads/simpleInterpreter.scala docs/examples/monads/stateInterpreter.scala docs/examples/parsing/ArithmeticParser.scala docs/examples/patterns.scala docs/examples/pilib/elasticBuffer.scala docs/examples/pilib/handover.scala docs/examples/pilib/piNat.scala docs/examples/typeinf.scala src/build/pack.xml
\| *	Remove docs/examples; they reside at scala/scala-dist	Adriaan Moors	2013-12-09	19	-850/+0
\| \|
\| *	[nomaster] Revert "Added a Swing ColorChooser wrapper"	Adriaan Moors	2013-02-12	1	-61/+0
\| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 08ab007c5c97f153902c4ac58f87e30fbf7cf99f. This is necessary to maintain binary compatibility with 2.10.0.
\| *	[nomaster] Revert "Added a Swing PopupMenu wrapper"	Adriaan Moors	2013-02-12	1	-33/+0
\|/ \| \| \| \| \|	This reverts commit bdff881f8a15d4de0c0ff2aa2427f0d8244d2d42. This is necessary to maintain binary compatibility with 2.10.0.
*	Added a Swing ColorChooser wrapper	ingoem	2012-09-26	1	-0/+61
\|
*	Added a Swing PopupMenu wrapper	ingoem	2012-09-26	1	-0/+33
\|
*	Clean up standard/swing library by deprecating/moving code examples	Simon Ochsenreither	2011-12-07	19	-0/+850
	Deprecate scala/xml/include/sax/Main.scala. Move scala/swing/test/* to docs/examples. Saves 160KB in scala-swing.jar. Fixes SI-4627.