~rgerrday/nightingalemirror/master

  • Committer: unknown
  • Date: 2012-02-14 22:19:37 UTC
  • mfrom: (0.1.127)
  • Revision ID: git-v1:a0882e5bab99137bd463e27eb21cdb83331abbd8
Merge branch 'sb-trunk-oldxul', remote-tracking branch 'origin' into sb-trunk-oldxul

Conflicts:
Filename Latest Rev Last Changed Committer Comment Size
..
public 3316 17 years ago lone bug 3468 - moved playlistcommands management into Diff
src 3316 17 years ago lone bug 3468 - moved playlistcommands management into Diff
test 4037 16 years ago lone bug 4418 - added playlistcommands unit test (r=moo Diff
Makefile.in 12248 13 years ago jhawk bug 22857 Implements the methods of the sbPlaylist 876 bytes Diff Download File