Johann 32a5c52856 Merge branch 'master' into experimental ... Conflicts: vp9/common/vp9_findnearmv.c vp9/common/vp9_rtcd_defs.sh vp9/decoder/vp9_decodframe.c vp9/decoder/x86/vp9_dequantize_sse2.c vp9/encoder/vp9_rdopt.c vp9/vp9_common.mk Resolve file name changes in favor of master. Resolve rdopt changes in favor of experimental, preserving the newer experiments. Change-Id: If51ed8f457470281c7b20a5c1a2f4ce2cf76c20f		2013-04-26 12:57:10 -07:00
..
make	Merge branch 'master' into experimental	2013-04-26 12:57:10 -07:00
x86-msvs	prefix vp8 asm_{com,dec,enc}_offsets files	2013-03-02 14:45:40 -08:00
.gitattributes	VisualStudio projects: asm tool updates	2010-06-14 17:29:14 -04:00
.gitignore	Initial WebM release	2010-05-18 11:58:33 -04:00