projects / profile / ivi / libvpx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e28e081 9eb0b2f)
(Re)Merge branch 'master' into cayuga
authorJohn Koleszar <jkoleszar@google.com>
Thu, 4 Aug 2011 21:05:55 +0000 (17:05 -0400)
committerJohn Koleszar <jkoleszar@google.com>
Thu, 4 Aug 2011 21:08:03 +0000 (17:08 -0400)
Corrected the merge direction this time, so that running
`git describe` on the master branch finds v0.9.7 as the most recent
tag.

Change-Id: I9e7b5d473c26e670c6d9a76f5c03fa617690651d


Trivial merge
Domain: Multimedia / Media Playback;