From 3345a6884c488ff3a535c2c9acdd33d74b37e311 Mon Sep 17 00:00:00 2001 From: Iain Merrick Date: Tue, 19 Oct 2010 14:37:37 +0100 Subject: Merge Chromium at 7.0.540.0 : Initial merge by git Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used. Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15 --- net/disk_cache/cache_util.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'net/disk_cache/cache_util.h') diff --git a/net/disk_cache/cache_util.h b/net/disk_cache/cache_util.h index cb78f169..455bf305 100644 --- a/net/disk_cache/cache_util.h +++ b/net/disk_cache/cache_util.h @@ -1,11 +1,10 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #ifndef NET_DISK_CACHE_CACHE_UTIL_H_ #define NET_DISK_CACHE_CACHE_UTIL_H_ - -#include +#pragma once #include "base/basictypes.h" -- cgit v1.2.3