Changeset 25ed065


Ignore:
Timestamp:
Jun 29, 2010, 1:39:06 AM (14 years ago)
Author:
Jessica B. Hamrick <jhamrick@…>
Branches:
debian
Children:
aa5ccdd
Parents:
1d7e681 (diff), cd17920 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Jessica B. Hamrick <jhamrick@…> (06/29/10 01:39:06)
git-committer:
Jessica B. Hamrick <jhamrick@…> (06/29/10 01:39:06)
Message:

Merge branch 'master' into debian

Files:
29 added
2 edited

Legend:

Unmodified
Added
Removed

  • queue/lib/queue

    r6157f97 rcd17920  
    2929    {
    3030        print $job_ref->{'user'}." is currently playing:\n";
    31         print "\t".$magic." file ".$job_ref->{'title'}."\n";
    3231       
    3332        if ($magic)
    3433        {
     34            print "\t".$magic." file ".$job_ref->{'title'}."\n";
    3535            foreach my $key (qw/Title Artist Album AlbumArtist/)
    3636            {
    … …  
    4040                }
    4141            }
     42        }
     43        else
     44        {
     45            print "\t".$job_ref->{'title'}."\n";
    4246        }
    4347       
    … …  
    5458            print "$user: \"$title\" by \"$artist\" on \"$album\"\n";
    5559        }
     60        else
     61        {
     62            my $user = $job_ref->{'user'};
     63            my $file = $job_ref->{'title'};
     64            print "$user: $file\n";
     65        }
    5666    }
    5767   

  • .gitignore

    r323f614 r1d7e681  
    11*~
     2debian/files
     3debian/*.debhelper
     4debian/*.substvars
     5debian/*.debhelper.log
     6debian/gutenbach/
     7debian/gutenbach-client/
     8debian/gutenbach-queue/
     9debian/gutenbach-remctl/
     10debian/gutenbach-server/
     11debian/stamp-makefile-build
     12debian/tmp/
    213client/bin/*.1.gz
Note: See TracChangeset for help on using the changeset viewer.