From: John Koleszar Date: Thu, 4 Aug 2011 21:05:55 +0000 (-0400) Subject: (Re)Merge branch 'master' into cayuga X-Git-Tag: v1.0.0~156^2~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56417a3075c5baa6dc8ad6f708547190458fbaa5;p=libvpx (Re)Merge branch 'master' into cayuga 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 --- 56417a3075c5baa6dc8ad6f708547190458fbaa5