aboutsummaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorFeng Xiao <xfxyjwf@gmail.com>2014-10-21 16:36:59 -0700
committerFeng Xiao <xfxyjwf@gmail.com>2014-10-21 16:36:59 -0700
commitf9e623b1671c8333247f251c5c4a2ef2ad7bcb2d (patch)
treebaaba8a2cbfbe263870769401b3ca52dd5e36da2 /CHANGES.txt
parent2853cd4a10febda5ba7407e2e8570eae411761a6 (diff)
parentbba83652e1be610bdb7ee1566ad18346d98b843c (diff)
downloadprotobuf-f9e623b1671c8333247f251c5c4a2ef2ad7bcb2d.tar.gz
protobuf-f9e623b1671c8333247f251c5c4a2ef2ad7bcb2d.tar.bz2
protobuf-f9e623b1671c8333247f251c5c4a2ef2ad7bcb2d.zip
Merge changes from 2.6.1 release branch.
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index affc419b..0d0ac814 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,4 @@
-2014-10-09 version 2.6.1rc1:
+2014-10-20 version 2.6.1:
C++
* Added atomicops support for Solaris.