Merge branch 'JAL-986_idwidthprefs' into develop
authorjprocter <jprocter@compbio.dundee.ac.uk>
Wed, 9 Nov 2011 15:21:10 +0000 (15:21 +0000)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Wed, 9 Nov 2011 15:21:10 +0000 (15:21 +0000)
commit63f3c5bdc2ce5540d8f6bfc9ed9af5d454805181
tree2b3f96f704c270b5d6e712679cc41d5163635728
parentf8307501f7b0437dd17a00291c5442a952d2c83d
parent7e538eabe7bc9b2905fac031165bf39c8963231c
Merge branch 'JAL-986_idwidthprefs' into develop

Conflicts:
.classpath
.classpath
help/html/features/preferences.html
src/jalview/bin/Cache.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/Preferences.java
src/jalview/jbgui/GPreferences.java