|
|
b614d0626f
|
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@6656 4adac7df-926f-26a2-2b94-8c16560cd09d
|
2014-07-10 22:47:02 +00:00 |
|
|
|
c00ca627fd
|
Rebase webrtc/base with r6521 version of talk/base:
cd webrtc/base
svn diff -r 6466:66521 http://webrtc.googlecode.com/svn/trunk/talk/base >
6521.diff
patch -p0 -i 6521.diff
BUG=3379
TBR=jiayl@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/17769004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6522 4adac7df-926f-26a2-2b94-8c16560cd09d
|
2014-06-23 16:15:27 +00:00 |
|
|
|
14abcc7322
|
libvpx's UNUSED macro conflicts with webrtc/base's. Added missing include of assert.h. Globally defined function "Unused" in talk/base and its copy (webrtc/base) is causing a conflict.
libvpx macro (UNUSED) can be found here:
http://src.chromium.org/viewvc/chrome/trunk/deps/third_party/libvpx/source/libvpx/vpx/vpx_codec.h
BUG=N/A
R=andrew@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/17489004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6185 4adac7df-926f-26a2-2b94-8c16560cd09d
|
2014-05-16 16:54:44 +00:00 |
|
|
|
f048872e91
|
Adds a modified copy of talk/base to webrtc/base. It is the first step in
migrating talk/base to webrtc/base.
BUG=N/A
R=niklas.enbom@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/17479005
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6129 4adac7df-926f-26a2-2b94-8c16560cd09d
|
2014-05-13 18:00:26 +00:00 |
|
|
|
e9a604accd
|
Revert 6107 "Adds a modified copy of talk/base to webrtc/base. I..."
This breaks Chromium FYI builds and prevent roll of webrtc/libjingle to Chrome.
http://chromegw.corp.google.com/i/chromium.webrtc.fyi/builders/Win%20Builder/builds/457
> Adds a modified copy of talk/base to webrtc/base. It is the first step in migrating talk/base to webrtc/base.
>
> BUG=N/A
> R=andrew@webrtc.org, wu@webrtc.org
>
> Review URL: https://webrtc-codereview.appspot.com/12199004
TBR=henrike@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/14479004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6116 4adac7df-926f-26a2-2b94-8c16560cd09d
|
2014-05-13 08:15:48 +00:00 |
|
|
|
2c7d1b39b9
|
Adds a modified copy of talk/base to webrtc/base. It is the first step in migrating talk/base to webrtc/base.
BUG=N/A
R=andrew@webrtc.org, wu@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/12199004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6107 4adac7df-926f-26a2-2b94-8c16560cd09d
|
2014-05-12 18:03:09 +00:00 |
|
