~ubuntu-branches/ubuntu/natty/vlc/natty

« back to all changes in this revision

Viewing changes to modules/gui/macosx/bookmarks.m

  • Committer: Bazaar Package Importer
  • Author(s): Benjamin Drung
  • Date: 2010-06-25 01:09:16 UTC
  • mfrom: (1.1.30 upstream)
  • Revision ID: james.westby@ubuntu.com-20100625010916-asxhep2mutg6g6pd
Tags: 1.1.0-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - build and install the libx264 plugin
  - add Xb-Npp header to vlc package
  - Add apport hook to include more vlc dependencies in bug reports
* Drop xulrunner patches.
* Drop 502_xulrunner_191.diff.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
 * bookmarks.m: MacOS X Bookmarks window
3
3
 *****************************************************************************
4
4
 * Copyright (C) 2005 - 2007 the VideoLAN team
5
 
 * $Id: 554fe8f92bfa693a334b57d9e0f6755d258f8590 $
 
5
 * $Id: 7d0f9efbae2350e7927c3ef528c145cd383670a3 $
6
6
 *
7
 
 * Authors: Felix Kühne <fkuehne@users.sf.net>
 
7
 * Authors: Felix Kühne <fkuehne at videolan dot org>
8
8
 *
9
9
 * This program is free software; you can redistribute it and/or modify
10
10
 * it under the terms of the GNU General Public License as published by