← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-17 23:23:09 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20111017232309-kzm6841lzk61ranj
Tags: 4.1.4-dfsg-1
http://bugs.debian.org/507188
http://bugs.debian.org/637349
https://launchpad.net/bugs/840668
* New upstream release.
  - Fixes missing icons when using pt_BR locale. (Closes: #507188)
  - Fixes guest additions download url. (Closes: #637349; LP: #840668)
* Refresh patches.
* Drop the vboxmouse x11 driver. The mouse integration is now completely
  handled by the kernel module.
* Restrict dh_pycentral to the virtualbox binary package.
* Merge changes from the Ubuntu package but use them only when built
  on Ubuntu:
  - Add an Apport hook.
  - Add vboxguest modalias to the package control field.
* Pass KBUILD_VERBOSE=2 to kmk.
* Add 36-fix-text-mode.patch to fix text mode when using the vboxvideo driver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
1
 
/* $Id: VBoxManageHelp.cpp 38191 2011-07-26 17:02:38Z vboxsync $ */
 
1
/* $Id: VBoxManageHelp.cpp $ */
2
2
/** @file
3
3
 * VBoxManage - help and other message output.
4
4
 */
542
542
                     "VBoxManage convertfromraw   <filename> <outputfile>\n"
543
543
                     "                            [--format VDI|VMDK|VHD]\n"
544
544
                     "                            [--variant Standard,Fixed,Split2G,Stream,ESX]\n"
 
545
                     "                            [--uuid <uuid>\n>"
545
546
#ifndef RT_OS_WINDOWS
546
547
                     "VBoxManage convertfromraw   stdin <outputfile> <bytes>\n"
547
548
                     "                            [--format VDI|VMDK|VHD]\n"
548
549
                     "                            [--variant Standard,Fixed,Split2G,Stream,ESX]\n"
 
550
                     "                            [--uuid <uuid>\n>"
549
551
#endif
550
552
                     "\n");
551
553