| commit | 2ee2439a1f41bd80fa167fb108339f2b535e30a6 | [log] [tgz] |
|---|---|---|
| author | Peter Boström <pbos@webrtc.org> | Mon Jun 22 05:57:16 2015 |
| committer | Peter Boström <pbos@webrtc.org> | Mon Jun 22 05:57:26 2015 |
| tree | 64723af82762e592fb27617096bc2ece412e46c4 | |
| parent | e8d191f00fff1ed3574d6a9d7e6d62b1acb5d5d3 [diff] |
Merge video_engine_core into webrtc target. Merges the two video targets since video_engine is no longer usable standalone. BUG=webrtc:1695 R=mflodman@webrtc.org, stefan@webrtc.org Review URL: https://codereview.webrtc.org/1184763009. Cr-Commit-Position: refs/heads/master@{#9479}