summaryrefslogtreecommitdiff
path: root/vp8/common/alloccommon.c
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2010-09-10 00:05:04 -0400
committerJohn Koleszar <jkoleszar@google.com>2010-09-10 00:05:04 -0400
commit42cb1d84f275211be7cc48685326b82827a9e88c (patch)
treef5501d08e63b034a63c1e5ed60ef3920a7613ec5 /vp8/common/alloccommon.c
parent5d012fc26bdf01f366cc1e3564f3d6b77678eb12 (diff)
parenta32ded1d5f32997ff4ba20fbdb71306798b05d3e (diff)
downloadlibvpx-42cb1d84f275211be7cc48685326b82827a9e88c.tar
libvpx-42cb1d84f275211be7cc48685326b82827a9e88c.tar.gz
libvpx-42cb1d84f275211be7cc48685326b82827a9e88c.tar.bz2
libvpx-42cb1d84f275211be7cc48685326b82827a9e88c.zip
Merge remote branch 'internal/upstream' into HEAD
Diffstat (limited to 'vp8/common/alloccommon.c')
-rw-r--r--vp8/common/alloccommon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vp8/common/alloccommon.c b/vp8/common/alloccommon.c
index 61c82e1b3..2b96b757e 100644
--- a/vp8/common/alloccommon.c
+++ b/vp8/common/alloccommon.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 The VP8 project authors. All Rights Reserved.
+ * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source