diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-06 22:04:31 -0600 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-07-06 22:04:31 -0600 |
| commit | 2967b22c6179ded9cc01496e10dcb0f292d0c182 (patch) | |
| tree | 9219e7dc564f3dc8af29ea142c4b5d409ea74310 /libre/virtualbox-libre/libre.patch | |
| parent | 55677d14e4829d6a7859333d3560db346c228fdf (diff) | |
| parent | e84010fb9a6f81d96d9c54661a7abde97a0eb187 (diff) | |
Merge branch 'master-remote' into master-undelete
Diffstat (limited to 'libre/virtualbox-libre/libre.patch')
| -rw-r--r-- | libre/virtualbox-libre/libre.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch index 75a5ed22f..7f236a678 100644 --- a/libre/virtualbox-libre/libre.patch +++ b/libre/virtualbox-libre/libre.patch @@ -1051,18 +1051,18 @@ diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIAct #ifdef VBOX_WITH_DEBUGGER_GUI /* 'Debugger' menu actions: */ -diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp ---- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-04-12 07:38:01.000000000 -0300 -+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-05-24 11:27:14.723176263 -0300 -@@ -651,7 +651,6 @@ +diff -Nur VirtualBox-4.2.14.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp VirtualBox-4.2.14/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp +--- VirtualBox-4.2.14.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-06-21 09:26:42.000000000 -0300 ++++ VirtualBox-4.2.14/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp 2013-06-24 18:08:12.915719347 -0300 +@@ -704,7 +704,6 @@ m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders)); m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog)); m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer)); - m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools)); - } - void UIMachineLogic::prepareActionConnections() -@@ -705,8 +704,6 @@ + /* Move actions into running-n-paused-n-stuck actions group: */ + m_pRunningOrPausedOrStuckActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_PowerOff)); +@@ -765,8 +764,6 @@ this, SLOT(sltOpenSharedFoldersDialog())); connect(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer), SIGNAL(toggled(bool)), this, SLOT(sltSwitchVrde(bool))); |