← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VirtualBox/VirtualBox2.qrc

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2010-05-25 22:51:39 UTC
  • mfrom: (0.3.6 upstream) (0.4.12 sid)
  • Revision ID: james.westby@ubuntu.com-20100525225139-hpo777g413iyfvzu
Tags: 3.2.0-dfsg-1ubuntu1
https://launchpad.net/bugs/288590
* Merge from Debian unstable, remaining changes:
  - Set x11 backport switch to "lucid".
  - VirtualBox should go in Accessories, not in System tools. (LP: #288590)
    - 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.
* Drop u03-fix-cpu-lockup.dpatch, fixed upstream.
* Remove Launchpad integration as (non-packaging) bugs should be reported
  upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
39
39
    <file alias="os_redhat.png">images/os_redhat.png</file>
40
40
    <file alias="os_redhat_64.png">images/os_redhat_64.png</file>
41
41
    <file alias="os_turbolinux.png">images/os_turbolinux.png</file>
 
42
    <file alias="os_turbolinux_64.png">images/os_turbolinux_64.png</file>
42
43
    <file alias="os_solaris.png">images/os_solaris.png</file>
43
44
    <file alias="os_solaris_64.png">images/os_solaris_64.png</file>
44
45
    <file alias="os_ubuntu.png">images/os_ubuntu.png</file>
62
63
    <file alias="os_winxp_64.png">images/os_winxp_64.png</file>
63
64
    <file alias="os_xandros.png">images/os_xandros.png</file>
64
65
    <file alias="os_xandros_64.png">images/os_xandros_64.png</file>
 
66
    <file alias="os_oracle.png">images/os_oracle.png</file>
 
67
    <file alias="os_oracle_64.png">images/os_oracle_64.png</file>
 
68
    <file alias="os_macosx.png">images/os_macosx.png</file>
 
69
    <file alias="os_macosx_64.png">images/os_macosx_64.png</file>
65
70
    <file alias="hd_16px.png">images/hd_16px.png</file>
66
71
    <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file>
67
72
    <file alias="hd_32px.png">images/hd_32px.png</file>