summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/library/scala/ScalaObject.scala16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/library/scala/ScalaObject.scala b/src/library/scala/ScalaObject.scala
new file mode 100644
index 0000000000..7cd64becbe
--- /dev/null
+++ b/src/library/scala/ScalaObject.scala
@@ -0,0 +1,16 @@
+/* __ *\
+** ________ ___ / / ___ Scala API **
+** / __/ __// _ | / / / _ | (c) 2003-2011, LAMP/EPFL **
+** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
+** /____/\___/_/ |_/____/_/ | | **
+** |/ **
+\* */
+
+package scala
+
+/** Until scala 2.10.0 this marker trait was added to
+ * scala-compiled classes. Now it only exists for backward
+ * compatibility.
+ */
+@deprecated("ScalaObject will be removed", "2.10.0")
+trait ScalaObject