~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VBoxBFE/MachineDebuggerImpl.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-01-30 23:27:25 UTC
  • mfrom: (0.3.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20110130232725-2ouajjd2ggdet0zd
Tags: 4.0.2-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Drop ubuntu-01-fix-build-gcc45.patch, fixed upstream.
* Drop ubuntu-02-as-needed.patch, added to the Debian package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
#else
22
22
# include <VBox/com/defs.h>
23
23
#endif
24
 
#include <VBox/em.h>
25
 
#include <VBox/patm.h>
26
 
#include <VBox/csam.h>
27
 
#include <VBox/vm.h>
 
24
#include <VBox/vmm/em.h>
 
25
#include <VBox/vmm/patm.h>
 
26
#include <VBox/vmm/csam.h>
 
27
#include <VBox/vmm/vm.h>
28
28
#include <VBox/err.h>
29
29
#include <VBox/log.h>
30
30
#include <iprt/semaphore.h>