diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-06-17 15:36:43 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-06-17 15:36:43 -0400 |
| commit | deb2e9cf620087b4dc5b78423b6ff9bf8971c1bc (patch) | |
| tree | 592d5eeb0cac290da19d6e660135a0f41dfd1dc3 /docs.mk | |
| parent | cefb915ab62a7cd91b347cc22449b2eb9b8c1df9 (diff) | |
| parent | a60fc419f50eefbef568ceecb93233471e894fa5 (diff) | |
| download | libvpx-deb2e9cf620087b4dc5b78423b6ff9bf8971c1bc.tar libvpx-deb2e9cf620087b4dc5b78423b6ff9bf8971c1bc.tar.gz libvpx-deb2e9cf620087b4dc5b78423b6ff9bf8971c1bc.tar.bz2 libvpx-deb2e9cf620087b4dc5b78423b6ff9bf8971c1bc.zip | |
Merge remote branch 'internal/upstream' into HEAD
Conflicts:
vp8/encoder/encodeframe.c
vp8/encoder/rdopt.c
Change-Id: I183fd3ce9e94617ec888c9f891055b9f1f8ca6c5
Diffstat (limited to 'docs.mk')
0 files changed, 0 insertions, 0 deletions