Index: /trunk/.scm-settings
===================================================================
--- /trunk/.scm-settings	(revision 35578)
+++ /trunk/.scm-settings	(revision 35579)
@@ -99,4 +99,5 @@
 */src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/*.*: --no-convert-tabs
 */src/apps/tunctl/tunctl.c: --no-convert-tabs
+*/src/VBox/Main/src-all/DisplayResampleImage.cpp: --no-convert-tabs
 vboxvideo_drm.c: --no-convert-tabs
 *linux.mod.c: --no-convert-tabs
Index: /trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk	(revision 35578)
+++ /trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk	(revision 35579)
@@ -138,5 +138,5 @@
 		$(VBOX_PATH_ADDITIONS.win.x86)/VBoxD3D9.dll \
 		$(VBOX_PATH_ADDITIONS.win.x86)/VBoxD3D8.dll
-		
+
  endif
 endif
Index: /trunk/src/VBox/Main/src-all/DisplayResampleImage.cpp
===================================================================
--- /trunk/src/VBox/Main/src-all/DisplayResampleImage.cpp	(revision 35578)
+++ /trunk/src/VBox/Main/src-all/DisplayResampleImage.cpp	(revision 35579)
@@ -316,2 +316,3 @@
     }
 }
+
Index: /trunk/src/VBox/Storage/testcase/tstVDIo.cpp
===================================================================
--- /trunk/src/VBox/Storage/testcase/tstVDIo.cpp	(revision 35578)
+++ /trunk/src/VBox/Storage/testcase/tstVDIo.cpp	(revision 35579)
@@ -1349,3 +1349,2 @@
 }
 
-