git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4099019 bcc6651)
Merge branch 'features/JAL-857_dynamic-example-files' into develop
authorJim Procter <jprocter@issues.jalview.org>
Mon, 7 Sep 2015 15:37:39 +0000 (16:37 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 7 Sep 2015 15:37:39 +0000 (16:37 +0100)
1  2 
examples/embeddedWJmol.html patch | diff1 | diff2 | blob | history
examples/javascript/jalview.js patch | diff1 | diff2 | blob | history

diff --cc examples/embeddedWJmol.html
Simple merge
diff --cc examples/javascript/jalview.js
Simple merge