Merge remote branch 'internal/upstream' into HEAD
authorJohn Koleszar <jkoleszar@google.com>
Fri, 15 Jul 2011 04:05:04 +0000 (00:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Fri, 15 Jul 2011 04:05:04 +0000 (00:05 -0400)
1  2 
vp8/encoder/onyx_if.c
vp8/encoder/onyx_int.h

Simple merge
Simple merge