aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Modify change logv3.0.0-alpha-3Bo Yang2015-05-281-2/+3
* Fixes on visual studio 2008unknown2015-05-278-12/+25
* Replace "\\" with "/" for windows path names.Feng Xiao2015-05-261-0/+4
* In std11, on mac, operator new doesn't take right reference.TeBoring2015-05-261-1/+1
* Add 3.0.0-alpha-3 release to CHANGES.txtBo Yang2015-05-261-0/+99
* Merge pull request #430 from xfxyjwf/std11_fixPaul Yang2015-05-261-0/+12
|\
| * Make MapAllocator work with C++11.Feng Xiao2015-05-261-0/+12
* | Merge pull request #429 from xfxyjwf/std11_fixPaul Yang2015-05-261-6/+0
|\|
| * Remove std::is_trivially_default_constructible.Feng Xiao2015-05-261-6/+0
* | When doing make distcheck, a src/google/protobuf/compiler/ruby is created toBo Yang2015-05-261-3/+3
|/
* uint64 has non-trivial destructor on 32-bit windows. This cause arenaBo Yang2015-05-261-5/+5
* Merge pull request #426 from thomasvl/mac_fixup_for_a3_branchPaul Yang2015-05-266-35/+15
|\
| * ObjC fixup for the branch.Thomas Van Lenten2015-05-266-35/+15
* | Null-terminate C strings.Feng Xiao2015-05-261-1/+2
* | Merge pull request #424 from jcanizales/make-objc-helpers-available-to-other-...Paul Yang2015-05-262-0/+2
|\ \ | |/ |/|
| * Add ObjC helpers header to vsproject/extract_includes.batJorge Canizales2015-05-261-0/+1
| * Adds objectivec_helpers.h to the headers installed by make.Jorge Canizales2015-05-261-0/+1
|/
* Replace the check of "../.git"Feng Xiao2015-05-261-25/+24
* Add new headers to extract_includes.batBo Yang2015-05-251-2/+16
* Add new files to Makefile.amBo Yang2015-05-251-1/+32
* Add csharp_EXTRA_DIST to all_EXTRA_DIST.Bo Yang2015-05-251-1/+1
* Add new files for java runtime to Makefile.amTeBoring2015-05-251-0/+3
* Explicitly call destructor of Mutex to release resources.Feng Xiao2015-05-251-1/+5
* Make hash_map forward constructor parameters to its base class.Feng Xiao2015-05-251-6/+17
* Add csharp files to Makefile.amBo Yang2015-05-251-0/+249
* Add objectivec/generate_descriptors_proto.sh in Makefile.amBo Yang2015-05-251-0/+1
* Copy two data files from ruby/tests to src/google/compiler/ruby. Tests in src...Bo Yang2015-05-254-7/+150
* Remove useless slash in Makefile.amTeBoring2015-05-251-22/+22
* Fix bugs in objective-c.Bo Yang2015-05-258-25/+248
* Merge pull request #422 from google/3.0.0-alpha-3-windows-fixPaul Yang2015-05-2513-45/+197
|\
| * Fix bugs on windows.Bo Yang2015-05-2411-41/+64
| * Merge pull request #421 from TeBoring/3.0.0-alpha-3-fixPaul Yang2015-05-242-4/+133
|/|
| * Merge branch '3.0.0-alpha-3-fix' of https://github.com/TeBoring/protobuf into...teboring2015-05-242-4/+14
| |\
| * | Add missing files for test to *.vcproj filesteboring2015-05-242-4/+133
* | | Merge pull request #420 from TeBoring/3.0.0-alpha-3-fixPaul Yang2015-05-242-4/+14
|\ \ \ | | |/ | |/|
| * | Fix C2385: accessing parent classes' member without specifying is ambiguous.Bo Yang2015-05-242-4/+14
| |/
* | Allow csharp to be configured as a language in configure.acteboring2015-05-231-1/+1
* | Merge pull request #419 from TeBoring/3.0.0-alpha-3-fixPaul Yang2015-05-233-22/+39
|\|
| * Add missing files to *.vcprojteboring2015-05-233-22/+39
* | Merge pull request #418 from TeBoring/3.0.0-alpha-3-fixPaul Yang2015-05-235-1504/+376
|\|
| * Clean up *.vcproj filesteboring2015-05-235-1504/+376
|/
* Add two languages (objectivec and csharp) to post_process_dist.shteboring2015-05-231-1/+1
* Merge pull request #416 from TeBoring/masterPaul Yang2015-05-237-9/+9
|\
| * Update version number to 3.0.0-alpha-3teboring2015-05-237-9/+9
|/
* Merge pull request #341 from yukawa/fix-undef-GOOGLE_PROTOBUF_MISSING_HASHFeng Xiao2015-05-221-1/+1
|\
| * Undef GOOGLE_PROTOBUF_MISSING_HASH after it is used.Yohei Yukawa2015-05-041-1/+1
* | Merge pull request #410 from thomasvl/objc_alpha2_dropPaul Yang2015-05-2295-1254/+6091
|\ \
| * | Objective C Second Alpha DropThomas Van Lenten2015-05-2295-1254/+6091
* | | Merge pull request #413 from TeBoring/masterPaul Yang2015-05-21227-3789/+25713
|\ \ \
| * | | down-integrate internal changesBo Yang2015-05-21227-3789/+25713