← Back to branch summary

~ubuntu-branches/ubuntu/natty/virtualbox-ose/natty-updates

« back to all changes in this revision

Viewing changes to src/VBox/Main/xml/VirtualBox-settings-macosx.xsd

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-10-15 02:12:28 UTC
  • mfrom: (0.3.10 upstream) (0.4.19 sid)
  • Revision ID: james.westby@ubuntu.com-20101015021228-5e6vbxgtes8mg189
Tags: 3.2.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - VirtualBox should go in Accessories, not in System tools.
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add ubuntu-01-fix-build-gcc45.patch to fix FTBFS due to uninitalized
  variables. Thanks to Lubomir Rintel <lkundrak@v3.sk> for the patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Main/xml/VirtualBox-settings-macosx.xsd
3
3
 *  :tabSize=2:indentSize=2:noTabs=true:
4
4
 *  :folding=explicit:collapseFolds=1:
5
5
 *
6
 
 *  Sun VirtualBox Settings Schema Version 1.0-macosx
 
6
 *  Oracle VM VirtualBox Settings Schema Version 1.0-macosx
7
7
 
8
8
     Copyright (C) 2004-2009 Oracle Corporation
9
9
 
26
26
 
27
27
<xsd:annotation>
28
28
  <xsd:documentation xml:lang="en">
29
 
    Sun VirtualBox Settings Schema (macosx).
30
 
    Copyright (c) 2004-2009 Sun Microsystems, Inc.
 
29
    Oracle VM VirtualBox Settings Schema (macosx).
 
30
    Copyright (c) 2004-2010 Oracle Corporation
31
31
  </xsd:documentation>
32
32
</xsd:annotation>
33
33