Changeset 50041 in vbox for trunk/src/VBox/Frontends/VirtualBox
- Timestamp:
- Jan 9, 2014 4:13:28 PM (11 years ago)
- svn:sync-xref-src-repo-rev:
- 91522
- Location:
- trunk
- Files:
-
- 40 edited
-
trunk
- Property svn:mergeinfo changed
/branches/VBox-4.2 merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverter.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/converter/UIConverter.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverter.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/converter/UIConverter.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIProcess.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/extensions/QIProcess.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIProcess.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/extensions/QIProcess.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDefs.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDefs.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDefs.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDefs.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequest.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequest.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequest.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequest.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequestWidget.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequestWidget.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequestWidget.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequestWidget.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetails.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetails.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetails.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetails.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsGroup.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsGroup.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsGroup.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsGroup.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsModel.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsModel.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsModel.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsModel.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsView.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsView.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsView.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsView.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
-
trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.h
- Property svn:mergeinfo changed
/branches/VBox-4.2/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.h (added) merged: 91503-91504,91506-91508,91510,91514-91515,91521
- Property svn:mergeinfo changed
Note:
See TracChangeset
for help on using the changeset viewer.