summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2012-12-21 15:20:41 -0800
committerJohn Koleszar <jkoleszar@google.com>2012-12-27 09:37:19 -0800
commit16810c10c1fbe3bb55b3da28a5bb37fe1c184af9 (patch)
tree2b5ddbabd155216da43baf137eee93b6fba7eb60 /.gitattributes
parentb9ce43029298182668d4dcb0e0814189e4a63c2a (diff)
parent5ebe94f9f148693a34bc861ef97a7fff6fc38251 (diff)
downloadlibvpx-16810c10c1fbe3bb55b3da28a5bb37fe1c184af9.tar
libvpx-16810c10c1fbe3bb55b3da28a5bb37fe1c184af9.tar.gz
libvpx-16810c10c1fbe3bb55b3da28a5bb37fe1c184af9.tar.bz2
libvpx-16810c10c1fbe3bb55b3da28a5bb37fe1c184af9.zip
Merge branch 'vp9-preview' of review:webm/libvpx
Merge the vp9-preview branch into master. Change-Id: If700b9054676f24bed9deb59050af546c1ca5296
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions