source.jalview.org Git - jalviewjs.git/atom - site/test_2.htm history jalviewjs.git Atom feed http://source.jalview.org/gitweb/?p=jalviewjs.git Apache static/git-favicon.png static/git-logo.png 2015-07-24T12:13:26Z gitweb Merge branch 'master' of https://source.jalview.org/git/jalviewjs.git 2015-07-24T12:13:26Z hansonr hansonr@stolaf.edu hansonr hansonr@stolaf.edu 2015-07-24T12:13:26Z http://source.jalview.org/gitweb/?p=jalviewjs.git;a=commitdiff;h=b9b7a352eee79b7764c3b09c9d19663075061d8c
Merge branch 'master' of https://source.jalview.org/git/jalviewjs.git

Conflicts:
	src/fr/orsay/lri/varna/models/rna/RNA.java
  • [D] site/test_2.htm
JAL-1807 includes ?j2sdebug flag and DebugJS._(msg) 2015-07-24T09:27:35Z hansonr hansonr@stolaf.edu hansonr hansonr@stolaf.edu 2015-07-24T09:27:35Z http://source.jalview.org/gitweb/?p=jalviewjs.git;a=commitdiff;h=7301a2415adab88038b291fc54caeeb3a5a47a44
JAL-1807 includes ?j2sdebug flag and DebugJS._(msg)
  • [D] site/test_2.htm
JAL-1807 Bob's JalviewJS prototype first commit 2015-07-23T13:14:52Z gmungoc g.m.carstairs@dundee.ac.uk gmungoc g.m.carstairs@dundee.ac.uk 2015-07-23T13:14:52Z http://source.jalview.org/gitweb/?p=jalviewjs.git;a=commitdiff;h=6154cb57a6eac3bb1344b8342495f5bb701ee921
JAL-1807 Bob's JalviewJS prototype first commit
  • [D] site/test_2.htm