Merge branch 'JAL-972-dasobert-to-jdas' into JAL-972-jdas
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 30 Mar 2012 12:29:04 +0000 (13:29 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 30 Mar 2012 12:29:04 +0000 (13:29 +0100)
commit2a5cbe264ec842c1a0f93e6bd78294607a94e686
tree3c83e2af915d701c2741fefa9057dd4b723b5b1a
parentb737b8f38d46da69364256c646f779c47e578563
parentdc801a9431e3340d9ddbe5fac3ad104484d51c86
Merge branch 'JAL-972-dasobert-to-jdas' into JAL-972-jdas

Conflicts:
.classpath
src/jalview/ws/dbsources/DasSequenceSource.java
src/jalview/ws/dbsources/das/DasSequenceSourceListener.java

merged jdas switchover into v2.8 development branch
.classpath
src/jalview/bin/Cache.java
src/jalview/gui/DasSourceBrowser.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/SequenceFetcher.java
src/jalview/ws/DBRefFetcher.java
src/jalview/ws/DasSequenceFeatureFetcher.java
src/jalview/ws/SequenceFetcher.java
src/jalview/ws/seqfetcher/DbSourceProxy.java