summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-08 01:16:07 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-08 01:16:07 +0000
commit4b7197004287da8739dbe1833494ef3fa67f2181 (patch)
treefdac333b6dba70bb5993ed326ea0efc5349b7d50 /net
parenteed87d91fdc5878e877361a2b99926aa820e33ba (diff)
downloadchromium_src-4b7197004287da8739dbe1833494ef3fa67f2181.zip
chromium_src-4b7197004287da8739dbe1833494ef3fa67f2181.tar.gz
chromium_src-4b7197004287da8739dbe1833494ef3fa67f2181.tar.bz2
Remove svn:mergeinfo props from many files.
BUG=none TEST=none Review URL: http://codereview.chromium.org/6814027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80878 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/http/http_network_layer.cc2
-rw-r--r--net/http/http_network_session.cc2
-rw-r--r--net/http/http_stream_factory_impl_unittest.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/net/http/http_network_layer.cc b/net/http/http_network_layer.cc
index 0fb1050..ce3fab8 100644
--- a/net/http/http_network_layer.cc
+++ b/net/http/http_network_layer.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
diff --git a/net/http/http_network_session.cc b/net/http/http_network_session.cc
index 52d4139..d13ec97 100644
--- a/net/http/http_network_session.cc
+++ b/net/http/http_network_session.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
diff --git a/net/http/http_stream_factory_impl_unittest.cc b/net/http/http_stream_factory_impl_unittest.cc
index 4246059..b37c173 100644
--- a/net/http/http_stream_factory_impl_unittest.cc
+++ b/net/http/http_stream_factory_impl_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.