git://source.jalview.org / proteocache.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 27060ed dcaaa5d)
Merge branch 'master' into servlets
authorSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 8 Nov 2013 14:03:34 +0000 (14:03 +0000)
committerSasha Sherstnev <a.sherstnev@dundee.ac.uk>
Fri, 8 Nov 2013 14:03:34 +0000 (14:03 +0000)
Conflicts:
server/compbio/listeners/ServletSequenceProtein.java
server/compbio/statistic/CassandraRequester.java


Trivial merge