diff options
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-10 22:47:02 +0000 |
|---|---|---|
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-10 22:47:02 +0000 |
| commit | c4b828d1b37c297978031b1a6871a03cc2522c3a (patch) | |
| tree | 7d0e01d43322f944ffe863bf01761816d5a004eb /voice_engine/voe_rtp_rtcp_impl.h | |
| parent | 9aa3497dc77180f83e28f6092253e2785f10d900 (diff) | |
| download | webrtc-c4b828d1b37c297978031b1a6871a03cc2522c3a.tar.gz | |
Rebase webrtc/base with r6655 version of talk/base:
cls to port: r6633,r6639 (there is no cl in between that affects base and all other talk/base cls took care of webrtc/base as well (see r6569, r6624)):
svn diff -r 6632:6639 http://webrtc.googlecode.com/svn/trunk/talk/base > 6655.diff
sed -i.bak "s/talk_base/rtc/g" 6655.diff
patch -p0 -i 6555.diff
BUG=3379
TBR=tommi@webrtc.org,jiayl@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/21879004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6656 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/voe_rtp_rtcp_impl.h')
0 files changed, 0 insertions, 0 deletions