diff options
author | Paul Phillips <paulp@improving.org> | 2012-03-14 12:27:53 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-03-14 12:27:53 -0700 |
commit | a127aae2a5fbae146ea81e470541209436222970 (patch) | |
tree | 75b8a7d3362896fd6562eac321b239326296b48a /src/android-library | |
parent | 0c9ffe55c774de261d32f36cc29b954638e86574 (diff) | |
parent | 5b562d4e7e451156236b48b3591db980a5691f8d (diff) | |
download | scala-a127aae2a5fbae146ea81e470541209436222970.tar.gz scala-a127aae2a5fbae146ea81e470541209436222970.tar.bz2 scala-a127aae2a5fbae146ea81e470541209436222970.zip |
Merge branch 'merge-inline' of /scratch/trunk3 into develop
Diffstat (limited to 'src/android-library')
-rw-r--r-- | src/android-library/scala/ScalaObject.scala | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/android-library/scala/ScalaObject.scala b/src/android-library/scala/ScalaObject.scala deleted file mode 100644 index f44116d1ce..0000000000 --- a/src/android-library/scala/ScalaObject.scala +++ /dev/null @@ -1,13 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2011, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - - - -package scala - -trait ScalaObject extends AnyRef |