From: Jim Procter Date: Wed, 4 Jun 2014 15:46:17 +0000 (+0100) Subject: Merge branch 'Release_2_8_1_Branch' X-Git-Tag: Release_2_8_1~1 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=abe30ffb1b93870156666c2d9c6d64377d1600a9;hp=6a55c198094801b2accf8b449b94aa65bdd3ec52;p=jalview.git Merge branch 'Release_2_8_1_Branch' --- diff --git a/AUTHORS b/AUTHORS index 2765038..ab81d5e 100644 --- a/AUTHORS +++ b/AUTHORS @@ -7,9 +7,10 @@ or might otherwise be considered author of Jalview. The people listed below are 'The Jalview Authors', who collectively own the copyright to the Jalview source code and permit it to be released under GPL. -This is the authoritative list. It was correct on 29th January 2014. +This is the authoritative list. It was correct on 4th June 2014. If you are releasing a version of Jalview, please make sure any statement of authorship in the GUI reflects the list shown here. +In particular, check the resources/authors.props file ! Jim Procter Andrew Waterhouse @@ -17,6 +18,7 @@ Jan Engelhardt Lauren Lui Natasha Sherstnev Daniel Barton +David Roldan-Martinez Michele Clamp James Cuff Steve Searle diff --git a/resources/authors.props b/resources/authors.props index 3290ec6..9582239 100644 --- a/resources/authors.props +++ b/resources/authors.props @@ -1,4 +1,4 @@ YEAR=2014 -AUTHORS=J Procter, AM Waterhouse, LM Lui, J Engelhardt, N Sherstnev, G Barton, M Clamp, S Searle -AUTHORFNAMES=Jim Procter, Andrew Waterhouse, Jan Engelhardt, Lauren Lui, Natasha Sherstnev, Michele Clamp, James Cuff, Steve Searle, David Martin & Geoff Barton +AUTHORS=J Procter, AM Waterhouse, J Engelhardt, LM Lui, D Barton, N Sherstnev, D Roldan-Martinez, M Clamp, S Searle, G Barton +AUTHORFNAMES=Jim Procter, Andrew Waterhouse, Jan Engelhardt, Lauren Lui, Daniel Barton, Natasha Sherstnev, David Roldan-Martinez, Michele Clamp, James Cuff, Steve Searle, David Martin & Geoff Barton \ No newline at end of file