Commit Graph

807 Commits

Author SHA1 Message Date
henrike@webrtc.org
0df5b8dfa6 Revert 4372 "Makes webrtc and libjingle build from the same gyp-..."
> Makes webrtc and libjingle build from the same gyp-file. Also, the libjingle and webrtc DEPS revisions were mismatching. This cl takes the most recent revision of mismatches.
> 
> TESTED=git try
> BUG=1932
> R=andrew@webrtc.org, fischman@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/1804004

TBR=henrike@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1835004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4373 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-18 18:58:29 +00:00
henrike@webrtc.org
4e4bf4db8b Makes webrtc and libjingle build from the same gyp-file. Also, the libjingle and webrtc DEPS revisions were mismatching. This cl takes the most recent revision of mismatches.
TESTED=git try
BUG=1932
R=andrew@webrtc.org, fischman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1804004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4372 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-18 18:33:55 +00:00
henrike@webrtc.org
8c7347124c talk: DataChannel.java repeated contents. This removes the duplicate.
TBR=ajm

BUG=N/A

Review URL: https://webrtc-codereview.appspot.com/1825004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4365 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-17 16:28:37 +00:00
henrike@webrtc.org
9de257d00f Update talk folder to revision=49470012. Same as 375 in libjingle's google code repository.
TBR=wu@webrtc.org

BUG=N/A

Review URL: https://webrtc-codereview.appspot.com/1824004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4364 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-17 14:42:53 +00:00
henrike@webrtc.org
7b2f955e56 Libjingle in webrtc needs updated AUTHORS, COPYING, LICENSE_THIRD_PARTY AND README.
BUG=1935
R=andrew@webrtc.org, fischman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1805005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4356 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-16 18:04:56 +00:00
henrike@webrtc.org
723d683ecb Update talk folder to revision=49260075. Same as 369 in libjingle's google code repository.
TBR=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1797004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4338 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-12 16:04:50 +00:00
henrike@webrtc.org
28e2075280 Adds trunk/talk folder of revision 359 from libjingles google code to
trunk/talk


git-svn-id: http://webrtc.googlecode.com/svn/trunk@4318 4adac7df-926f-26a2-2b94-8c16560cd09d
2013-07-10 00:45:36 +00:00