| commit | a4c887da63131873a04b2af603efeb88b48b885e | [log] [tgz] |
|---|---|---|
| author | John Koleszar <jkoleszar@google.com> | Fri Jan 28 08:33:52 2011 -0500 |
| committer | John Koleszar <jkoleszar@google.com> | Fri Jan 28 08:33:52 2011 -0500 |
| tree | 7ab0a5aee02bafba742b7285d741578d860c9782 | |
| parent | 6c61e28e7a8fc6cca6808b8579195aa051fc03eb [diff] | |
| parent | 73207a1d8bf1ecf6bc6fea03ae56109fe18e9574 [diff] |
Merge remote branch 'origin/master' into experimental Conflicts: vp8/encoder/rdopt.c Change-Id: Ic17907df70fff45c9e766b5d0cbab0c5f1a1095f