Merge from core

253c80d0 · Jesse Beder · ad0a3311 · 06bf012d · 253c80d0
Commit 253c80d0 authored Mar 23, 2014 by Jesse Beder
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

test/mock_event_handler.h test/mock_event_handler.h +0 -1

No files found.
--- a/test/mock_event_handler.h
+++ b/test/mock_event_handler.h
@@ -21,5 +21,4 @@ class MockEventHandler : public EventHandler {
  MOCK_METHOD3(OnMapStart, void(const Mark&, const std::string&, anchor_t));
  MOCK_METHOD0(OnMapEnd, void());
 };
 }