summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
hansonr [Fri, 24 Jul 2015 12:03:28 +0000 (13:03 +0100)]
Merge branch 'debug' of https://source.jalview.org/git/jalviewjs.git into debug
hansonr [Fri, 24 Jul 2015 12:02:22 +0000 (13:02 +0100)]
JAL-1807 test3
Jim Procter [Fri, 24 Jul 2015 11:36:16 +0000 (12:36 +0100)]
true conflict\!
hansonr [Fri, 24 Jul 2015 11:36:15 +0000 (12:36 +0100)]
JAL-1807 test3 bob changes "twice"
hansonr [Fri, 24 Jul 2015 11:32:38 +0000 (12:32 +0100)]
Merge branch 'debug' of https://source.jalview.org/git/jalviewjs.git into debug
hansonr [Fri, 24 Jul 2015 11:29:59 +0000 (12:29 +0100)]
JAL-1807
hansonr [Fri, 24 Jul 2015 11:26:12 +0000 (12:26 +0100)]
JAL-1807 conflict test
Jim Procter [Fri, 24 Jul 2015 11:25:36 +0000 (12:25 +0100)]
This should be a really annoying conflict\!
hansonr [Fri, 24 Jul 2015 11:11:09 +0000 (12:11 +0100)]
JAL-1807 test
hansonr [Fri, 24 Jul 2015 09:33:04 +0000 (10:33 +0100)]
JAL-1807 still testing
hansonr [Fri, 24 Jul 2015 09:27:35 +0000 (10:27 +0100)]
JAL-1807 includes ?j2sdebug flag and DebugJS._(msg)
gmungoc [Thu, 23 Jul 2015 13:14:52 +0000 (14:14 +0100)]
JAL-1807 Bob's JalviewJS prototype first commit
git://source.jalview.org / jalviewjs.git / log