| commit | 92a9bacf9aeadf5f845bf464fdbc49e37b4ca21c | [log] [tgz] |
|---|---|---|
| author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Mon Jul 14 22:03:57 2014 |
| committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Mon Jul 14 22:03:57 2014 |
| tree | 2b595349fca057dc5419ec846f58268991c73b12 | |
| parent | 1b84116417d5b5809482cd0b0d9dd4af54668508 [diff] |
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@6683 4adac7df-926f-26a2-2b94-8c16560cd09d