tree 426b0685b2493b11631be21306de2d67e9ec3c9d
parent 238dae8604af11c484bdd8a9f5f17a07f29b4469
parent 06f58c0df7f0f05d6cf8e3e4715f8c4111424640
author John Koleszar <jkoleszar@google.com> 1312404272 -0700
committer Code Review <code-review@webmproject.org> 1312404272 -0700

Merge changes I585167e1,Ia07602bd into cayuga

* changes:
  Fix building of static libs on universal-darwin
  Fix asm offsets generation for universal-darwin builds