aboutsummaryrefslogtreecommitdiffhomepage
path: root/third_party/protobuf
diff options
context:
space:
mode:
authorGravatar Han-Wen Nienhuys <hanwen@google.com>2015-02-25 16:45:20 +0100
committerGravatar Han-Wen Nienhuys <hanwen@google.com>2015-02-25 16:45:20 +0100
commitd08b27fa9701fecfdb69e1b0d1ac2459efc2129b (patch)
tree5d50963026239ca5aebfb47ea5b8db7e814e57c8 /third_party/protobuf
Update from Google.
-- MOE_MIGRATED_REVID=85702957
Diffstat (limited to 'third_party/protobuf')
-rw-r--r--third_party/protobuf/LICENSE33
-rw-r--r--third_party/protobuf/protobuf-2.5.0.jarbin0 -> 487803 bytes
-rwxr-xr-xthird_party/protobuf/protoc.amd64bin0 -> 16964226 bytes
-rwxr-xr-xthird_party/protobuf/protoc.darwinbin0 -> 2124196 bytes
-rw-r--r--third_party/protobuf/protoc.exebin0 -> 2321934 bytes
5 files changed, 33 insertions, 0 deletions
diff --git a/third_party/protobuf/LICENSE b/third_party/protobuf/LICENSE
new file mode 100644
index 0000000000..705db579c9
--- /dev/null
+++ b/third_party/protobuf/LICENSE
@@ -0,0 +1,33 @@
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+ * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Code generated by the Protocol Buffer compiler is owned by the owner
+of the input file used when generating it. This code is not
+standalone and requires a support library to be linked with it. This
+support library is itself covered by the above license.
diff --git a/third_party/protobuf/protobuf-2.5.0.jar b/third_party/protobuf/protobuf-2.5.0.jar
new file mode 100644
index 0000000000..0d33369260
--- /dev/null
+++ b/third_party/protobuf/protobuf-2.5.0.jar
Binary files differ
diff --git a/third_party/protobuf/protoc.amd64 b/third_party/protobuf/protoc.amd64
new file mode 100755
index 0000000000..1e6ef90626
--- /dev/null
+++ b/third_party/protobuf/protoc.amd64
Binary files differ
diff --git a/third_party/protobuf/protoc.darwin b/third_party/protobuf/protoc.darwin
new file mode 100755
index 0000000000..cf702e79e2
--- /dev/null
+++ b/third_party/protobuf/protoc.darwin
Binary files differ
diff --git a/third_party/protobuf/protoc.exe b/third_party/protobuf/protoc.exe
new file mode 100644
index 0000000000..caeaf6c96c
--- /dev/null
+++ b/third_party/protobuf/protoc.exe
Binary files differ