Merge remote branch 'internal/upstream' into HEAD

author John Koleszar <jkoleszar@google.com>

Sat, 16 Apr 2011 04:05:07 +0000 (00:05 -0400)

committer John Koleszar <jkoleszar@google.com>

Sat, 16 Apr 2011 04:05:07 +0000 (00:05 -0400)
author John Koleszar <jkoleszar@google.com>
Sat, 16 Apr 2011 04:05:07 +0000 (00:05 -0400)
committer John Koleszar <jkoleszar@google.com>
Sat, 16 Apr 2011 04:05:07 +0000 (00:05 -0400)
diff --cc vp8/decoder/detokenize.c

index 2d050512af0988b3ddb6a4f2fa631e6a544543fb,c22e0f28c2c763353c738b42188e177b5fb14ac9..2d050512af0988b3ddb6a4f2fa631e6a544543fb

mode 100755,100644..100644
--- 1/vp8/decoder/detokenize.c
--- 2/vp8/decoder/detokenize.c
+++ b/vp8/decoder/detokenize.c
diff --cc vp8/encoder/rdopt.c
Simple merge
diff --cc vpxenc.c

index 93ad6f647ec9ae0854069af9b3e3d8431505ef34,39256b6657dfe8093b916df3058e1fa9625a1a11..93ad6f647ec9ae0854069af9b3e3d8431505ef34

mode 100755,100644..100644
--- 1/vpxenc.c
--- 2/vpxenc.c
+++ b/vpxenc.c
author	John Koleszar <jkoleszar@google.com>
	Sat, 16 Apr 2011 04:05:07 +0000 (00:05 -0400)
committer	John Koleszar <jkoleszar@google.com>
	Sat, 16 Apr 2011 04:05:07 +0000 (00:05 -0400)
		1	2
vp8/decoder/detokenize.c	patch \|	diff1 \|	diff2 \|	blob \| history
vp8/encoder/rdopt.c	patch \|	diff1 \|	diff2 \|	blob \| history
vpxenc.c	patch \|	diff1 \|	diff2 \|	blob \| history