3253 reconciled with develop
authorBobHanson <hansonr@stolaf.edu>
Wed, 8 Apr 2020 19:15:51 +0000 (14:15 -0500)
committerBobHanson <hansonr@stolaf.edu>
Wed, 8 Apr 2020 19:15:51 +0000 (14:15 -0500)
commit92d66803db3319c4db605177d502de91302ef684
treebc11a00f07d8db6ac2dab99aa633b83abdcf6e11
parentc844fbda900f095b00a72be43ebf2a068b5050bc
3253 reconciled with develop
src/jalview/bin/Cache.java
src/jalview/gui/JvSwingUtils.java
src/jalview/gui/Preferences.java
src/jalview/io/BackupFiles.java
src/jalview/io/BackupFilesPresetEntry.java [new file with mode: 0644]
src/jalview/io/IntKeyStringValueEntry.java [new file with mode: 0644]
src/jalview/io/PIRFile.java
src/jalview/jbgui/GPreferences.java