From d06194330da2bb8da887d2e1adeacb3a5c1504b2 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 5 Jan 2011 12:15:11 +0000 Subject: Merge WebKit at r72805: Initial merge by Git Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790 --- .../Configurations/WebKitTestRunnerCommon.vsprops | 48 +++++++++++++--------- 1 file changed, 28 insertions(+), 20 deletions(-) (limited to 'WebKitTools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops') diff --git a/WebKitTools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops b/WebKitTools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops index 4233b55..70f8ca6 100644 --- a/WebKitTools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops +++ b/WebKitTools/WebKitTestRunner/Configurations/WebKitTestRunnerCommon.vsprops @@ -1,20 +1,28 @@ - - - - - + + + + + + + -- cgit v1.1