Yaowu Xu 7c514e2dfd Merged branch 'master' into nextgenv2 ... Resolved Conflicts in the following files: configure vp10/common/idct.c vp10/encoder/dct.c vp10/encoder/encodemb.c vp10/encoder/rdopt.c Change-Id: I4cb3986b0b80de65c722ca29d53a0a57f5a94316		2015-09-29 16:17:32 -07:00
..
make	Merged branch 'master' into nextgenv2	2015-09-29 16:17:32 -07: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