aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #361 from brianduff/sync_aospFeng Xiao2015-06-061-12/+10
|\
| * Speed up little endian int/long writes.Jeff Davidson2015-05-111-12/+10
* | Merge pull request #468 from AustinSchuh/unsigned_protoFeng Xiao2015-06-063-19/+19
|\ \
| * | Marked another compiler literal unsigned.Austin Schuh2015-06-053-19/+19
* | | Merge pull request #467 from AustinSchuh/GOOGLE_PREDICT_FALSEFeng Xiao2015-06-061-1/+1
|\ \ \
| * | | Fixed bug in GOOGLE_PREDICT_FALSE.Austin Schuh2015-06-051-1/+1
| |/ /
* | | Update ./update_file_lists.sh.Feng Xiao2015-06-053-10/+127
* | | Add back incorrectly excluded cmake targets.Feng Xiao2015-06-051-1/+2
|/ /
* | Merge pull request #460 from haberman/conformance-namesJoshua Haberman2015-06-055-60/+235
|\ \
| * | Removed test_name from conformance.proto.Josh Haberman2015-06-044-15/+15
| * | Conformance tests can now be excluded based on their names.Josh Haberman2015-06-036-59/+234
* | | Merge pull request #462 from anandolee/masterJie Luo2015-06-0428-1647/+1861
|\ \ \
| * | | Migrate writer to io::Printer for C#Jie Luo2015-06-0428-1647/+1861
* | | | Merge pull request #457 from xfxyjwf/cmakeFeng Xiao2015-06-0412-11/+767
|\ \ \ \
| * | | | Fix README.md formatting.Feng Xiao2015-06-041-34/+43
| * | | | Add an cmake option to exclude tests.Feng Xiao2015-06-041-2/+4
| * | | | Add cmake support.Feng Xiao2015-05-3112-11/+756
* | | | | Merge pull request #456 from xfxyjwf/androidJisi Liu2015-06-042-494/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove Android.mkFeng Xiao2015-06-022-494/+0
* | | | | Merge pull request #453 from bakineggs/masterFeng Xiao2015-06-031-0/+14
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add protoc path detection for Mac OSDan Barry2015-06-021-0/+14
* | | | | Merge pull request #444 from xfxyjwf/vs2010_fixFeng Xiao2015-06-022-9/+9
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Call copy() only if there is something to copy.Feng Xiao2015-05-311-1/+3
| * | | Fix MapAllocator::destroy() bug.Feng Xiao2015-05-311-8/+6
* | | | Merge pull request #447 from murgatroid99/podspec_fixPaul Yang2015-06-021-8/+19
|\ \ \ \
| * \ \ \ Merge pull request #1 from jcanizales/podspec_fixMichael Lumish2015-06-021-7/+19
| |\ \ \ \
| | * | | | Reorder fields so it looks like exclude_files affects preserve_pathsJorge Canizales2015-06-021-4/+4
| | * | | | Better documentationJorge Canizales2015-06-021-4/+4
| | * | | | Remove backslashes after commasJorge Canizales2015-06-021-12/+13
| | * | | | Remove struct.proto too (redefines GPBValue)Jorge Canizales2015-06-021-1/+1
| | * | | | s/pobjc/pbobjc and simplify a bit the podspecJorge Canizales2015-06-021-3/+14
| |/ / / /
| * | | | Ignored files that cause build errorsmurgatroid992015-06-011-3/+2
| * | | | Add remaining not-already-imported well known types files to podspecmurgatroid992015-06-011-1/+1
| |/ / /
* | | | Merge pull request #305 from ezegomez/masterFeng Xiao2015-06-021-1/+1
|\ \ \ \
| * | | | Fix unittest in i386Ezequiel Lara Gomez2015-04-271-1/+1
* | | | | Merge pull request #451 from jcanizales/document-why-podspec-is-on-rootFeng Xiao2015-06-021-0/+5
|\ \ \ \ \
| * | | | | Document why the podspec is on the root of the repoJorge Canizales2015-06-011-0/+5
| | |/ / / | |/| | |
* | | | | Merge pull request #441 from anandolee/masterJan Tattermusch2015-06-0111-302/+677
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Change the C# enum generator inherit from primitive generatorJie Luo2015-05-2911-302/+677
* | | | Merge pull request #404 from anandolee/masterJie Luo2015-05-2939-2163/+4720
|\| | |
| * | | Add oneof support for C#Jie Luo2015-05-2939-2163/+4720
* | | | Add distributionManagement explicitly to prevent maven from usingBo Yang2015-05-292-0/+20
* | | | Update version number to 3.0.0-alpha-4Bo Yang2015-05-296-6/+6
* | | | 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