From 1eba9d9c7424235b1a6dcd866fcd06d12e08a7f3 Mon Sep 17 00:00:00 2001
From: "jieluo@google.com"
 <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d>
Date: Mon, 25 Aug 2014 20:17:53 +0000
Subject: merge tags/2.6.0 into trunk

---
 examples/list_people.cc | 1 +
 1 file changed, 1 insertion(+)

(limited to 'examples')

diff --git a/examples/list_people.cc b/examples/list_people.cc
index 5363152e..d0f40d61 100644
--- a/examples/list_people.cc
+++ b/examples/list_people.cc
@@ -4,6 +4,7 @@
 #include <fstream>
 #include <string>
 #include "addressbook.pb.h"
+#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
 using namespace std;
 
 // Iterates though all people in the AddressBook and prints info about them.
-- 
cgit v1.2.3