From: Jim Procter Date: Thu, 8 Oct 2015 11:09:47 +0000 (+0100) Subject: Merge branch 'develop' into Release_2_9_0b1_Branch X-Git-Tag: Release_2_9_0b2~6^2~2 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=57dd16688caa6dacaeaf465bab3ee8b6126e1a51;hp=a875782b000ff363877677507b7512f8a6c70875;p=jalview.git Merge branch 'develop' into Release_2_9_0b1_Branch --- diff --git a/build.xml b/build.xml index e1ca55f..a0bfc85 100755 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ diff --git a/examples/css/ie6.css b/examples/css/ie6.css index 2a70fa1..ceefae1 100644 --- a/examples/css/ie6.css +++ b/examples/css/ie6.css @@ -1,6 +1,6 @@ /** - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) - * Copyright (C) $$Year-Rel$$ The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * diff --git a/examples/css/ie7.css b/examples/css/ie7.css index 47ba859..0bf5fce 100644 --- a/examples/css/ie7.css +++ b/examples/css/ie7.css @@ -1,6 +1,6 @@ /** - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) - * Copyright (C) $$Year-Rel$$ The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * diff --git a/examples/css/reset.css b/examples/css/reset.css index de3e422..4a6c995 100644 --- a/examples/css/reset.css +++ b/examples/css/reset.css @@ -1,6 +1,6 @@ /** - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) - * Copyright (C) $$Year-Rel$$ The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * diff --git a/examples/css/style.css b/examples/css/style.css index 3184fde..e9ea707 100644 --- a/examples/css/style.css +++ b/examples/css/style.css @@ -1,6 +1,6 @@ /** - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) - * Copyright (C) $$Year-Rel$$ The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * diff --git a/examples/embedded.html b/examples/embedded.html index 426e275..28292be 100644 --- a/examples/embedded.html +++ b/examples/embedded.html @@ -1,6 +1,6 @@