aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1737 from jcanizales/testv3.0.0-beta-3.33.0.0-beta-3Paul Yang2016-07-0160-182/+2923
|\
| * Merge commit '137d6a09bbbbfa801d653224703ddc59e3700704' into testJorge Canizales2016-07-0160-182/+2923
|/|
| * Bump version number to beta-3.1v3.0.0-beta-3.1objc-framework-fixBo Yang2016-06-131-1/+1
| * Automated testing tweaks for ObjCThomas Van Lenten2016-06-133-79/+84
| * Better support for using the proto library from a framework.Thomas Van Lenten2016-06-1328-95/+543
| * Make the CocoaPods integration tests more robustThomas Van Lenten2016-06-135-14/+36
| * Add shared schemes for the CocoaPods integration testsThomas Van Lenten2016-06-132-0/+182
| * Expand the OS X/Xcode gitignoresThomas Van Lenten2016-06-132-7/+28
| * CocoaPod Integration TestsThomas Van Lenten2016-06-1323-0/+2063
* | Fix tests for CommonJS.v3.0.0-beta-3.2Josh Haberman2016-06-171-2/+11
* | Added plugin.proto to well-known types for JS.Josh Haberman2016-06-171-0/+1
* | Bugfix: base the require logic on the file being required.Josh Haberman2016-06-171-4/+4
* | JS: import well-known types from google-protobuf package.Josh Haberman2016-06-172-2/+33
* | Address review comments on function namevjpai2016-06-171-2/+2
* | Remove a friend-class template that is only used for theVijay Pai2016-06-171-4/+7
|/
* Merge pull request #1540 from pherl/changelogv3.0.0-beta-3Jisi Liu2016-05-161-2/+8
|\
| * Update changes for liteJisi Liu2016-05-161-2/+8
* | Merge pull request #1533 from pherl/mapcommentJisi Liu2016-05-161-3/+1
|\ \
| * | Remove the comments about iterator validationJisi Liu2016-05-131-3/+1
|/ /
* | Merge pull request #1532 from pherl/changelogJisi Liu2016-05-131-1/+6
|\|
| * Update changelogs for C++ mapsJisi Liu2016-05-131-1/+6
|/
* Merge pull request #1527 from haberman/changelogJisi Liu2016-05-121-1/+14
|\
| * Added release notes for Ruby and JavaScript.Josh Haberman2016-05-121-1/+14
|/
* Merge pull request #1520 from pherl/hashmapvs2008Jisi Liu2016-05-121-3/+55
|\
| * Bridge vs2008 hashmaps.Jisi Liu2016-05-111-3/+55
* | Merge pull request #1524 from anandolee/masterJisi Liu2016-05-121-1/+5
|\ \
| * | python changesJie Luo2016-05-111-1/+5
| * | Merge pull request #1 from google/beta-3Jie Luo2016-05-11862-26667/+104755
| |\ \ | |/ / |/| |
* | | Merge pull request #1515 from pherl/changelog-beta3Jisi Liu2016-05-111-0/+104
|\ \ \
| * | | Update comments for csharp, zero-copy and objc.Jisi Liu2016-05-111-3/+55
| * | | Fix typo.Jisi Liu2016-05-111-1/+1
| * | | Initial draft for changelog.Jisi Liu2016-05-101-0/+52
| | |/ | |/|
* | | Merge pull request #1512 from pherl/beta-3Jisi Liu2016-05-1112-14/+14
|\ \ \
| * | | Fix csharp versionJisi Liu2016-05-111-1/+1
| * | | Update version numbers for other languagesJisi Liu2016-05-108-10/+10
| * | | Update version numbers for beta3Jisi Liu2016-05-103-3/+3
| |/ /
* | | Merge pull request #1514 from pherl/fix_heap_checkJisi Liu2016-05-101-3/+4
|\ \ \
| * | | Fix the command line interface unittest againJisi Liu2016-05-101-3/+4
| |/ /
* | | Merge pull request #1513 from pherl/fix-build-protocJisi Liu2016-05-101-1/+1
|\ \ \ | |/ / |/| |
| * | Fix protoc build artifact script.Jisi Liu2016-05-101-1/+1
|/ /
* | Merge pull request #1510 from thomasvl/nonnullv3.0.0-beta-3-pre-1Thomas Van Lenten2016-05-102-65/+90
|\ \
| * | Declare an init and avoid passing NULL to initWithValue:count:Thomas Van Lenten2016-05-102-65/+90
* | | Merge pull request #1498 from thomasvl/build_cleanupJoshua Haberman2016-05-093-3/+110
|\ \ \ | |/ / |/| |
| * | Add the missing maintiner-clean entry for benchmarksThomas Van Lenten2016-05-061-0/+3
| * | Properly express all outputs for the conformance buildThomas Van Lenten2016-05-061-3/+105
| * | Add two missing ignores for conformance directory.Thomas Van Lenten2016-05-061-0/+2
* | | Merge pull request #1502 from pherl/masterJisi Liu2016-05-066-1492/+0
|\ \ \
| * | | Remove accidentally restored deleted files.Jisi Liu2016-05-066-1492/+0
* | | | Merge pull request #1494 from pherl/masterJisi Liu2016-05-065-6/+6
|\| | |
| * | | Fix using std::shared_ptrJisi Liu2016-05-055-5/+5