diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 01:16:07 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-08 01:16:07 +0000 |
| commit | 4b7197004287da8739dbe1833494ef3fa67f2181 (patch) | |
| tree | fdac333b6dba70bb5993ed326ea0efc5349b7d50 /media | |
| parent | eed87d91fdc5878e877361a2b99926aa820e33ba (diff) | |
| download | chromium_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 'media')
| -rw-r--r-- | media/video/video_mock_objects.cc | 2 | ||||
| -rw-r--r-- | media/video/video_mock_objects.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/video/video_mock_objects.cc b/media/video/video_mock_objects.cc index 5873b59..e89fb65 100644 --- a/media/video/video_mock_objects.cc +++ b/media/video/video_mock_objects.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/media/video/video_mock_objects.h b/media/video/video_mock_objects.h index 1a9592c..96ea3fa 100644 --- a/media/video/video_mock_objects.h +++ b/media/video/video_mock_objects.h @@ -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. |