From afb4b72037e3f13db208590fc782c4bc8e27f862 Mon Sep 17 00:00:00 2001
From: Jeff Davidson <jpd@google.com>
Date: Tue, 20 Jan 2015 13:02:58 -0800
Subject: Upgrade protobuf library to v2.6.1.

The previous commit was actually between v2.6.0 and v2.6.1. This CL
was created by generating a patch with:

git format-patch edc5994525c79cd1919859a370837a6ff7c8e308..v2.6.1

and applying this patch to the tree. The patch was clean except for
pom.xml, where the packaging type should have previously been changed
from "jar" to "bundle".

Reran ./configure && make -j12 check to regenerate configure script
and makefiles.

Change-Id: I817ff426c9a512cbda0246df5aee38f97e762dea
---
 examples/list_people.cc | 1 -
 1 file changed, 1 deletion(-)

(limited to 'examples/list_people.cc')

diff --git a/examples/list_people.cc b/examples/list_people.cc
index d0f40d6..5363152 100644
--- a/examples/list_people.cc
+++ b/examples/list_people.cc
@@ -4,7 +4,6 @@
 #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.1