diff options
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-14 22:03:57 +0000 |
|---|---|---|
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-07-14 22:03:57 +0000 |
| commit | d3de227a946cf9f65c5255743efb920977061278 (patch) | |
| tree | 57f26ce65d63583fbe330633820266d50ccb14aa /modules/video_processing/main/source/video_processing.gypi | |
| parent | 82383d9b14ff8e5fedf5a70229eb0ac6b512909a (diff) | |
| download | webrtc-d3de227a946cf9f65c5255743efb920977061278.tar.gz | |
Rebase webrtc/base with r6682 version of talk/base:
cls ported: r6671, r6672, r6679 (reverts and unreverts in r6680, r6682).
svn diff -r 6656:6682 http://webrtc.googlecode.com/svn/trunk/talk/base >
6682.diff
sed -i.bak "s/talk_base/rtc/g" 6682.diff
sed -i.bak "s/#ifdef WIN32/#if defined(WEBRTC_WIN)/g" 6682.diff
sed -i.bak "s/#if defined(WIN32)/#if defined(WEBRTC_WIN)/g" 6682.diff
patch -p0 -i 6682.diff
BUG=3379
TBR=tommi@webrtc.org,jiayl@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/14969004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6683 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'modules/video_processing/main/source/video_processing.gypi')
0 files changed, 0 insertions, 0 deletions