git://source.jalview.org / proteocache.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 567aef9 642acd8)
Merge branch 'servlets'
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Sat, 9 Nov 2013 11:48:07 +0000 (11:48 +0000)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Sat, 9 Nov 2013 11:48:07 +0000 (11:48 +0000)
Conflicts:
datadb/compbio/cassandra/CassandraNativeConnector.java
server/compbio/statistic/CassandraRequester.java


Trivial merge