Index: /trunk/include/VBox/VBoxTpG.h =================================================================== --- /trunk/include/VBox/VBoxTpG.h (revision 40985) +++ /trunk/include/VBox/VBoxTpG.h (revision 40986) @@ -14,4 +14,13 @@ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * The contents of this file may alternatively be used under the terms + * of the Common Development and Distribution License Version 1.0 + * (CDDL) only, as it comes in the "COPYING.CDDL" file of the + * VirtualBox OSE distribution, in which case the provisions of the + * CDDL are applicable instead of those of the GPL. + * + * You may elect to license modified versions of this file under the + * terms and conditions of either the GPL or the CDDL or both. */ Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/d3d8_main.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/d3d8_main.c (revision 40985) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d8/d3d8_main.c (revision 40986) @@ -28,4 +28,5 @@ * of the LGPL is applied is otherwise unspecified. */ + #define VBOX_WINE_DEBUG_DEFINES Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/d3d9_main.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/d3d9_main.c (revision 40985) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/d3d9/d3d9_main.c (revision 40986) @@ -30,4 +30,5 @@ * of the LGPL is applied is otherwise unspecified. */ + #define VBOX_WINE_DEBUG_DEFINES Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxDbgGl.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxDbgGl.c (revision 40985) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxDbgGl.c (revision 40986) Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxDbgGl.h =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxDbgGl.h (revision 40985) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/vbox/VBoxDbgGl.h (revision 40986) Index: /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_main.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_main.c (revision 40985) +++ /trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_main.c (revision 40986) @@ -31,4 +31,5 @@ * of the LGPL is applied is otherwise unspecified. */ + #define VBOX_WINE_DEBUG_DEFINES Index: /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsfhlp.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsfhlp.c (revision 40985) +++ /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsfhlp.c (revision 40986) @@ -5,5 +5,5 @@ * File System Driver system helpers */ - + /* * Copyright (C) 2012 Oracle Corporation Index: /trunk/src/VBox/Additions/x11/x11include/xorg-server-1.10.0/parser.h =================================================================== --- /trunk/src/VBox/Additions/x11/x11include/xorg-server-1.10.0/parser.h (revision 40985) +++ /trunk/src/VBox/Additions/x11/x11include/xorg-server-1.10.0/parser.h (revision 40986) @@ -19,4 +19,13 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ + +/* + * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice + * other than GPL or LGPL is available it will apply instead, Oracle elects to use only + * the General Public License version 2 (GPLv2) at this time for any software where + * a choice of GPL license versions is made available with the language indicating + * that GPLv2 or any later version may be used, or where a choice of which version + * of the GPL is applied is otherwise unspecified. + */ /* As a special exception, you may create a larger work that contains Index: /trunk/src/VBox/Additions/x11/x11include/xorg-server-1.11.0/parser.h =================================================================== --- /trunk/src/VBox/Additions/x11/x11include/xorg-server-1.11.0/parser.h (revision 40985) +++ /trunk/src/VBox/Additions/x11/x11include/xorg-server-1.11.0/parser.h (revision 40986) @@ -19,4 +19,13 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ + +/* + * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice + * other than GPL or LGPL is available it will apply instead, Oracle elects to use only + * the General Public License version 2 (GPLv2) at this time for any software where + * a choice of GPL license versions is made available with the language indicating + * that GPLv2 or any later version may be used, or where a choice of which version + * of the GPL is applied is otherwise unspecified. + */ /* As a special exception, you may create a larger work that contains Index: /trunk/src/VBox/Additions/x11/x11include/xorg-server-1.12.0/parser.h =================================================================== --- /trunk/src/VBox/Additions/x11/x11include/xorg-server-1.12.0/parser.h (revision 40985) +++ /trunk/src/VBox/Additions/x11/x11include/xorg-server-1.12.0/parser.h (revision 40986) @@ -19,4 +19,13 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ + +/* + * Oracle GPL Disclaimer: For the avoidance of doubt, except that if any license choice + * other than GPL or LGPL is available it will apply instead, Oracle elects to use only + * the General Public License version 2 (GPLv2) at this time for any software where + * a choice of GPL license versions is made available with the language indicating + * that GPLv2 or any later version may be used, or where a choice of which version + * of the GPL is applied is otherwise unspecified. + */ /* As a special exception, you may create a larger work that contains Index: /trunk/src/VBox/ExtPacks/Makefile.kmk =================================================================== --- /trunk/src/VBox/ExtPacks/Makefile.kmk (revision 40985) +++ /trunk/src/VBox/ExtPacks/Makefile.kmk (revision 40986) @@ -7,6 +7,11 @@ # Copyright (C) 2010-2012 Oracle Corporation # -# Oracle Corporation confidential -# All rights reserved +# This file is part of VirtualBox Open Source Edition (OSE), as +# available from http://www.virtualbox.org. This file is free software; +# you can redistribute it and/or modify it under the terms of the GNU +# General Public License (GPL) as published by the Free Software +# Foundation, in version 2 as it comes in the "COPYING" file of the +# VirtualBox OSE distribution. VirtualBox OSE is distributed in the +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. # Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.def =================================================================== --- /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.def (revision 40985) +++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.def (revision 40986) @@ -1,3 +1,3 @@ -; $Id$ +; $Id$ ; @file ; VBoxNetFltNobj.def - Notify Object for Bridged Networking Driver. Index: /trunk/src/VBox/HostDrivers/linux/export_modules =================================================================== --- /trunk/src/VBox/HostDrivers/linux/export_modules (revision 40985) +++ /trunk/src/VBox/HostDrivers/linux/export_modules (revision 40986) @@ -6,4 +6,5 @@ # Copyright (C) 2007 Oracle Corporation # +# This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; # you can redistribute it and/or modify it under the terms of the GNU