← 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/cbinding/VBoxXPCOMCGlue.c

  • 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/cbinding/VBoxXPCOMCGlue.c
1
 
/* $Revision: 46177 $ */
 
1
/* $Revision: 65760 $ */
2
2
/** @file
3
3
 * Glue code for dynamically linking to VBoxXPCOMC.
4
4
 */
5
5
 
6
6
/*
7
 
 * Copyright (C) 2008-2009 Sun Microsystems, Inc.
 
7
 * Copyright (C) 2008-2010 Oracle Corporation
8
8
 *
9
9
 * Permission is hereby granted, free of charge, to any person
10
10
 * obtaining a copy of this software and associated documentation