| Index: jingle/glue/pseudotcp_adapter.h
|
| ===================================================================
|
| --- jingle/glue/pseudotcp_adapter.h (revision 113718)
|
| +++ jingle/glue/pseudotcp_adapter.h (working copy)
|
| @@ -36,8 +36,6 @@
|
| const net::CompletionCallback& callback) OVERRIDE;
|
| virtual int Write(net::IOBuffer* buffer, int buffer_size,
|
| net::OldCompletionCallback* callback) OVERRIDE;
|
| - virtual int Write(net::IOBuffer* buffer, int buffer_size,
|
| - const net::CompletionCallback& callback) OVERRIDE;
|
| virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
|
| virtual bool SetSendBufferSize(int32 size) OVERRIDE;
|
|
|
|
|
| Property changes on: jingle/glue/pseudotcp_adapter.h
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|