summaryrefslogtreecommitdiffstats
path: root/src/google/protobuf/unittest_import.proto
diff options
context:
space:
mode:
authorJeff Davidson <jpd@google.com>2015-01-22 00:13:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-22 00:13:03 +0000
commit0fba86c685b6fd8b82055541012c1ab1efc370cd (patch)
tree204041a6b0ac0941d14faa2afe222d1b4b627db9 /src/google/protobuf/unittest_import.proto
parent2429788d4e969267e28ba708130e1f6f0d737a48 (diff)
parente6ae5ecfc360e1ad261b561c8e5e16b6554d5347 (diff)
downloadexternal_protobuf-0fba86c685b6fd8b82055541012c1ab1efc370cd.zip
external_protobuf-0fba86c685b6fd8b82055541012c1ab1efc370cd.tar.gz
external_protobuf-0fba86c685b6fd8b82055541012c1ab1efc370cd.tar.bz2
am e6ae5ecf: Merge "Upgrade protobuf library to v2.6.1."
* commit 'e6ae5ecfc360e1ad261b561c8e5e16b6554d5347': Upgrade protobuf library to v2.6.1.
Diffstat (limited to 'src/google/protobuf/unittest_import.proto')
-rw-r--r--src/google/protobuf/unittest_import.proto2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/unittest_import.proto b/src/google/protobuf/unittest_import.proto
index c115b11..38275dc 100644
--- a/src/google/protobuf/unittest_import.proto
+++ b/src/google/protobuf/unittest_import.proto
@@ -1,6 +1,6 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
-// http://code.google.com/p/protobuf/
+// https://developers.google.com/protocol-buffers/
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are