commit | 4e5f65a4c689ad739cdcd47c91ec0f3e520caca7 | [log] [tgz] |
---|---|---|
author | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Thu Jun 05 20:40:11 2014 |
committer | henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Thu Jun 05 20:40:11 2014 |
tree | ac9738bcb627de186faf2f37d998146f8a194a0d | |
parent | 94454b71adc37e15fd3f5a5fc432063f05caabcb [diff] |
Rebase webrtc/base with r6345 version of talk/base: cd webrtc/base svn diff -r 6249:6300 http://webrtc.googlecode.com/svn/trunk/talk/base > 6300.diff patch -p0 -i 6300.diff ls genericslot* | xargs rm cp ../../talk/base/sigslottester* . manual edits of sigslottester* to get rid of talk and talk_base. BUG=3379 TBR=jiayang Review URL: https://webrtc-codereview.appspot.com/19649004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6347 4adac7df-926f-26a2-2b94-8c16560cd09d