diff options
| author | Felix Geyer <debfx-pkg@fobos.de> | 2010-05-19 18:16:21 +0200 |
|---|---|---|
| committer | Felix Geyer <debfx-pkg@fobos.de> | 2010-05-19 18:16:21 +0200 |
| commit | 1ea6626f22e9895b90f8795f794aa229a233a545 (patch) | |
| tree | 603ba0666d90c1e6a153fbbf44a8f6214aef65b7 /src/VBox/Devices/USB/os2/USBProxyDevice-os2.cpp | |
| parent | 4f10dc4e82c2a0625f613db6c47113c8831d9214 (diff) | |
| parent | 0c7f2a3d122182fe8890ea1f8178d1955c5a04dc (diff) | |
| download | virtualbox-1ea6626f22e9895b90f8795f794aa229a233a545.tar.gz | |
Merge branch 'experimental-upstream' into upstream
Conflicts:
src/VBox/Additions/linux/sharedfolders/files_vboxsf
Diffstat (limited to 'src/VBox/Devices/USB/os2/USBProxyDevice-os2.cpp')
0 files changed, 0 insertions, 0 deletions