From 8a0cc5859cdaf1d7cc49c989b7ca2d2e39d02a3b Mon Sep 17 00:00:00 2001 From: Rene Ladan Date: Fri, 2 May 2014 10:15:13 +0000 Subject: Update to 34.0.1847.132 Obtained from: https://github.com/gliaskos/freebsd-chromium/ MFH: 2014Q2 Security: http://vuxml.org/freebsd/7cf25a0c-d031-11e3-947b-00262d5ed8ee.html http://vuxml.org/freebsd/963413a5-bf50-11e3-a2d6-00262d5ed8ee.html --- www/chromium/files/patch-gpu__config__gpu_test_config.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'www/chromium/files/patch-gpu__config__gpu_test_config.cc') diff --git a/www/chromium/files/patch-gpu__config__gpu_test_config.cc b/www/chromium/files/patch-gpu__config__gpu_test_config.cc index 686252c9d7dd..ae6eaae83dcd 100644 --- a/www/chromium/files/patch-gpu__config__gpu_test_config.cc +++ b/www/chromium/files/patch-gpu__config__gpu_test_config.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_test_config.cc.orig 2013-09-02 21:22:26.000000000 +0300 -+++ gpu/config/gpu_test_config.cc 2013-09-02 21:23:55.000000000 +0300 -@@ -17,8 +17,6 @@ +--- ./gpu/config/gpu_test_config.cc.orig 2014-04-24 22:35:32.000000000 +0200 ++++ ./gpu/config/gpu_test_config.cc 2014-04-24 23:23:46.000000000 +0200 +@@ -23,8 +23,6 @@ GPUTestConfig::OS GetCurrentOS() { #if defined(OS_CHROMEOS) return GPUTestConfig::kOsChromeOS; @@ -9,7 +9,7 @@ #elif defined(OS_WIN) int32 major_version = 0; int32 minor_version = 0; -@@ -53,6 +51,8 @@ +@@ -61,6 +59,8 @@ } #elif defined(OS_ANDROID) return GPUTestConfig::kOsAndroid; -- cgit v1.2.3