diff options
author | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-08-30 21:24:16 +0000 |
---|---|---|
committer | wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-08-30 21:24:16 +0000 |
commit | 952740e2dafeb2599d21778eb2e1b8f1c8f2bb07 (patch) | |
tree | 35cf2fc79adab45d211c8070459290546f51468d /media/base/videoengine_unittest.h | |
parent | e483a6bd4c266d65c82fc72d6480f898f193b27e (diff) | |
download | talk-952740e2dafeb2599d21778eb2e1b8f1c8f2bb07.tar.gz |
Update talk to 51664136.
R=mallinath@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2148004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@4649 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'media/base/videoengine_unittest.h')
-rw-r--r-- | media/base/videoengine_unittest.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/base/videoengine_unittest.h b/media/base/videoengine_unittest.h index 00ae4ba..d8b9bcb 100644 --- a/media/base/videoengine_unittest.h +++ b/media/base/videoengine_unittest.h @@ -23,7 +23,7 @@ // OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF // ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#ifndef TALK_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ +#ifndef TALK_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ // NOLINT #define TALK_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ #include <string> @@ -1667,4 +1667,4 @@ class VideoMediaChannelTest : public testing::Test, cricket::FakeVideoRenderer renderer2_; }; -#endif // TALK_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ +#endif // TALK_MEDIA_BASE_VIDEOENGINE_UNITTEST_H_ NOLINT |