From: jprocter Date: Tue, 27 Sep 2011 08:15:20 +0000 (+0100) Subject: apply version 2.7 copyright X-Git-Tag: Release_2_7~11 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=a45774ee31d9f35d4eff46d54d7deab719afb092;p=jalview.git apply version 2.7 copyright --- diff --git a/RELEASE b/RELEASE index 8bd893d..a0d1141 100644 --- a/RELEASE +++ b/RELEASE @@ -1,3 +1,3 @@ -jalview.release=-r Release_2_6_Branch -jalview.version=2.6.1 +jalview.release=-b Release_2_7_Branch +jalview.version=2.7 diff --git a/THIRDPARTYLIBS b/THIRDPARTYLIBS index 5918fc2..e777ead 100644 --- a/THIRDPARTYLIBS +++ b/THIRDPARTYLIBS @@ -31,3 +31,8 @@ wsdl4j.jar xercesImpl.jar xml-apis.jar +Additional dependencies + +examples/javascript/deployJava.js : http://java.com/js/deployJava.js +examples/javascript/jquery*.js : BSD license +examples/javascript/jshashtable-2.1.js : Apache License diff --git a/build.xml b/build.xml index 7d63c56..e9528fc 100755 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index b52f0c2..3298729 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,3 +1,20 @@ +############################################################################### +# Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) +# Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle +# +# This file is part of Jalview. +# +# Jalview is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. +# +# Jalview is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty +# of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with Jalview. If not, see . +############################################################################### nbbuild.xml.data.CRC32=f5d3c6c2 nbbuild.xml.script.CRC32=307ee084 nbbuild.xml.stylesheet.CRC32=28e38971@1.43.1.45 diff --git a/nbproject/project.properties b/nbproject/project.properties index 87df84d..69d1428 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,3 +1,20 @@ +############################################################################### +# Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) +# Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle +# +# This file is part of Jalview. +# +# Jalview is free software: you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. +# +# Jalview is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty +# of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with Jalview. If not, see . +############################################################################### annotation.processing.enabled=true annotation.processing.enabled.in.editor=false annotation.processing.run.all.processors=true diff --git a/nbproject/project.xml b/nbproject/project.xml index 73b5c3a..f3db653 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -1,4 +1,21 @@ - + + org.netbeans.modules.java.j2seproject diff --git a/resources/embl_mapping.xml b/resources/embl_mapping.xml index c7b2538..d3af6c7 100644 --- a/resources/embl_mapping.xml +++ b/resources/embl_mapping.xml @@ -1,7 +1,7 @@