source.jalview.org Git - jalview.git/commit

author	tcofoegbu <tcnofoegbu@dundee.ac.uk>
	Mon, 11 May 2015 09:40:47 +0000 (10:40 +0100)
committer	tcofoegbu <tcnofoegbu@dundee.ac.uk>
	Mon, 11 May 2015 09:40:47 +0000 (10:40 +0100)
commit	a40bbc57a85658544e2e5d7cc2a7596b762566dc
tree	52374fb13a5946e8b105777af198178f03d25e74	tree \| snapshot
parent	2150df780eddbdf72013d29ee8eabb0f235c7bb4	commit \| diff

JAL-1641 cherry-picked changes into develop compatible branch

20 files changed:

src/jalview/gui/AlignFrame.java		diff \| blob \| history
src/jalview/gui/CutAndPasteTransfer.java		diff \| blob \| history
src/jalview/gui/Desktop.java		diff \| blob \| history
src/jalview/gui/PopupMenu.java		diff \| blob \| history
src/jalview/io/AlignFile.java		diff \| blob \| history
src/jalview/io/AppletFormatAdapter.java		diff \| blob \| history
src/jalview/io/BioJsHTMLOutput.java		diff \| blob \| history
src/jalview/io/FileLoader.java		diff \| blob \| history
src/jalview/io/FormatAdapter.java		diff \| blob \| history
src/jalview/io/HtmlFile.java		diff \| blob \| history
src/jalview/io/IdentifyFile.java		diff \| blob \| history
src/jalview/io/JSONFile.java	[new file with mode: 0644]	blob
src/jalview/json/binding/v1/AlignmentAnnotationPojo.java	[new file with mode: 0644]	blob
src/jalview/json/binding/v1/AlignmentPojo.java	[new file with mode: 0644]	blob
src/jalview/json/binding/v1/AnnotationPojo.java	[new file with mode: 0644]	blob
src/jalview/json/binding/v1/BioJsFeaturePojo.java	[deleted file]	blob \| history
src/jalview/json/binding/v1/JalviewSettingsPojo.java	[moved from src/jalview/json/binding/v1/BioJsAlignmentPojo.java with 75% similarity]	diff \| blob \| history
src/jalview/json/binding/v1/SequenceFeaturesPojo.java	[new file with mode: 0644]	blob
src/jalview/json/binding/v1/SequenceGrpPojo.java	[new file with mode: 0644]	blob
src/jalview/json/binding/v1/SequencePojo.java	[moved from src/jalview/json/binding/v1/BioJsSeqPojo.java with 59% similarity]	diff \| blob \| history