Permalink
Browse files

Merge branch 'master' of github.com:GMOD/GBrowse

  • Loading branch information...
2 parents 2be5172 + 281dcf9 commit 6051a183290c7ee786957c05692cdfa1003f2e7f @lstein lstein committed Sep 6, 2012
Showing with 5 additions and 2 deletions.
  1. +1 −0 Changes
  2. +2 −0 MANIFEST
  3. +2 −2 lib/Bio/Graphics/Browser2/Action.pm
View
@@ -4,6 +4,7 @@
2.50
* Add gbrowse_import_ucsc_db.pl, which will create a fully functional starter database
from a UCSC data source (e.g. 'hg19').
+ * Add VirtualBox and EC2 virtual machine support (see http://gmod.org/wiki/GBrowse2_VMs).
* Prompt user before overwriting a customized config file.
2.49
View
@@ -674,3 +674,5 @@ t/testdata/phylo_align/species.tre
t/testdata/phylo_align/volvox_alignment.conf
t/testdata/phylo_align/volvox_phyloalign.gff
t/testdata/TemplateCopy.pm
+META.yml
+META.json
@@ -731,8 +731,8 @@ sub ACTION_get_feature_info {
defined(my $dbid = CGI::unescape($q->param('dbid'))) or croak;
defined(my $fid = CGI::unescape($q->param('feature_id'))) or croak;
$fid or return (204,'text/plain','nothing at all');
- $dbid =~ /^remote/ && $etype eq 'mouseover';
- && return (204,'text/plain','nothing at all');
+ ($dbid =~ /^remote/ && $etype eq 'mouseover')
+ && return (204,'text/plain','nothing at all');
if ($fid eq '*summary*') {
return (200,'text/plain',$self->render->feature_summary_message($etype,$track));

0 comments on commit 6051a18

Please sign in to comment.