Merge release-4-6 into master

[alexxy/gromacs.git] / COPYING

diff --git a/COPYING b/COPYING
index d180161274d7785335c0556c42ab2ef4e60e2644..93293d42f28d0514cddbf4f3030a6f5487be992c 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -13,9 +13,8 @@ This file contains the licenses for:
  5. thread_mpi
  6. Blas
  7. Lapack
- 8. OpenMM (binary distributions only)
- 9. Subset of Boost C++ library
-10. Google Test and Google Mock
+ 8. Subset of Boost C++ library
+ 9. Google Test and Google Mock
 
 1. GROMACS
 ====================================
@@ -557,13 +556,8 @@ better idea to use the full reference implementation.
 
 Erik Lindahl, 2008-10-07.
 
-8. OpenMM (binary distributions only)
-=====================================
 
-There are several licenses which cover different parts of OpenMM as described
-in the file openmm/licenses/Licenses.txt accompanying the binary distribution.
-
-9. Subset of Boost C++ library
+8. Subset of Boost C++ library
 ==============================
 Files: src/external/boost/boost/*
 
@@ -591,7 +585,7 @@ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
 ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.
 
-10. Google Test and Google Mock
+ 9. Google Test and Google Mock
 ===============================
 Files: src/external/gmock-1.6.0/*
 
@@ -622,4 +616,4 @@ 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.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file