git://source.jalview.org / proteocache.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 92420f7)
Merge branch 'servlets'
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Mon, 25 Nov 2013 11:04:31 +0000 (11:04 +0000)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Mon, 25 Nov 2013 11:04:31 +0000 (11:04 +0000)
Conflicts:
datadb/compbio/cassandra/StructureProteinPrediction.java
server/compbio/statistic/CassandraRequester.java


No differences found