git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a16c37a ead7c43)
Merge branch 'develop' into menard
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 17 Aug 2012 12:13:56 +0000 (13:13 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 17 Aug 2012 12:13:56 +0000 (13:13 +0100)
Conflicts:
src/jalview/ws/jws2/AAConsClient.java
 (preferred develop)


Trivial merge