Merge branch 'master' into scalastyle

1 files changed, 8 insertions, 0 deletions

diff --git a/src/main/scala/Chisel/Main.scala b/src/main/scala/Chisel/Main.scala
new file mode 100644
index 00000000..23abc763
--- /dev/null
+++ b/src/main/scala/Chisel/Main.scala
@@ -0,0 +1,8 @@
+// See LICENSE for details
+
+package Chisel
+
+@deprecated("chiselMain doesn't exist in Chisel3", "3.0") object chiselMain {
+  def apply[T <: Module](args: Array[String], gen: () => T) =
+    Predef.assert(false)
+}