# HG changeset patch
# User wenzelm
# Date 1478262451 -3600
# Node ID e84fb8b4245c96058a116e9e03037df0b5038ddd
# Parent  6f852a4c1b0ebd0a56fcfe9199ee5ca1242c6605
back to stable scala-2.11.8;

diff -r 6f852a4c1b0e -r e84fb8b4245c Admin/components/main
--- a/Admin/components/main	Fri Nov 04 11:37:24 2016 +0100
+++ b/Admin/components/main	Fri Nov 04 13:27:31 2016 +0100
@@ -10,7 +10,7 @@
 jortho-1.0-2
 kodkodi-1.5.2
 polyml-5.6-1
-scala-2.12.0
+scala-2.11.8
 ssh-java-20161009
 spass-3.8ds
 sqlite-jdbc-3.8.11.2
diff -r 6f852a4c1b0e -r e84fb8b4245c src/Pure/Concurrent/counter.scala
--- a/src/Pure/Concurrent/counter.scala	Fri Nov 04 11:37:24 2016 +0100
+++ b/src/Pure/Concurrent/counter.scala	Fri Nov 04 13:27:31 2016 +0100
@@ -27,4 +27,3 @@
 
   override def toString: String = count.toString
 }
-
diff -r 6f852a4c1b0e -r e84fb8b4245c src/Tools/jEdit/src/theories_dockable.scala
--- a/src/Tools/jEdit/src/theories_dockable.scala	Fri Nov 04 11:37:24 2016 +0100
+++ b/src/Tools/jEdit/src/theories_dockable.scala	Fri Nov 04 13:27:31 2016 +0100
@@ -178,7 +178,7 @@
 
   private class Node_Renderer extends ListView.Renderer[Document.Node.Name]
   {
-    def componentFor(list: ListView[_ <: isabelle.Document.Node.Name], isSelected: Boolean,
+    def componentFor(list: ListView[_], isSelected: Boolean,
       focused: Boolean, name: Document.Node.Name, index: Int): Component =
     {
       val component = Node_Renderer_Component
diff -r 6f852a4c1b0e -r e84fb8b4245c src/Tools/jEdit/src/timing_dockable.scala
--- a/src/Tools/jEdit/src/timing_dockable.scala	Fri Nov 04 11:37:24 2016 +0100
+++ b/src/Tools/jEdit/src/timing_dockable.scala	Fri Nov 04 13:27:31 2016 +0100
@@ -65,7 +65,7 @@
 
     class Renderer extends ListView.Renderer[Entry]
     {
-      def componentFor(list: ListView[_ <: Timing_Dockable.this.Entry],
+      def componentFor(list: ListView[_],
         isSelected: Boolean, focused: Boolean, entry: Entry, index: Int): Component =
       {
         val component = Renderer_Component