summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan@lightbend.com>2016-11-01 11:31:04 -0700
committerAdriaan Moors <adriaan@lightbend.com>2016-11-01 11:34:07 -0700
commitad9f66ed00a264f1d2c51f280aaeec0184d1457b (patch)
tree72836eba2ba7e720c99d54259e991addac58cfa8 /doc
parent9aafca3a362b3f4e0105c8bb561663945d42e9e0 (diff)
downloadscala-ad9f66ed00a264f1d2c51f280aaeec0184d1457b.tar.gz
scala-ad9f66ed00a264f1d2c51f280aaeec0184d1457b.tar.bz2
scala-ad9f66ed00a264f1d2c51f280aaeec0184d1457b.zip
Revert "Temporarily insource Scalacheck 1.11.6"
This reverts commit 22dac3118e97b2a4707d42ef1f47ac292a8ed385.
Diffstat (limited to 'doc')
-rw-r--r--doc/LICENSE.md1
-rw-r--r--doc/licenses/bsd_scalacheck.txt32
2 files changed, 0 insertions, 33 deletions
diff --git a/doc/LICENSE.md b/doc/LICENSE.md
index 0718c43e05..a07ba32e0b 100644
--- a/doc/LICENSE.md
+++ b/doc/LICENSE.md
@@ -46,7 +46,6 @@ This license is used by the following third-party libraries:
This license is used by the following third-party libraries:
* jline
- * scalacheck
### [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause)
This license is used by the following third-party libraries:
diff --git a/doc/licenses/bsd_scalacheck.txt b/doc/licenses/bsd_scalacheck.txt
deleted file mode 100644
index f1920752e0..0000000000
--- a/doc/licenses/bsd_scalacheck.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-ScalaCheck LICENSE
-
-Copyright (c) 2007-2013, Rickard Nilsson
-All rights reserved.
-
-Permission to use, copy, modify, and distribute this software in source
-or binary form for any purpose with or without fee is hereby granted,
-provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- 3. Neither the name of the author nor the names of its contributors
- may be used to endorse or promote products derived from this
- software without specific prior written permission.
-
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.