aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAge
* python changesGravatar Jie Luo2016-05-11
|
* Merge pull request #1 from google/beta-3Gravatar Jie Luo2016-05-11
|\ | | | | Beta 3
| * Merge pull request #1515 from pherl/changelog-beta3Gravatar Jisi Liu2016-05-11
| |\ | | | | | | Initial draft for changelog.
| | * Update comments for csharp, zero-copy and objc.Gravatar Jisi Liu2016-05-11
| | |
| * | Merge pull request #1512 from pherl/beta-3Gravatar Jisi Liu2016-05-11
| |\ \ | | | | | | | | Update version numbers for beta3
| | * | Fix csharp versionGravatar Jisi Liu2016-05-11
| | | |
| | | * Fix typo.Gravatar Jisi Liu2016-05-11
| | | |
| * | | Merge pull request #1514 from pherl/fix_heap_checkGravatar Jisi Liu2016-05-10
| |\ \ \ | | | | | | | | | | Fix the command line interface unittest again
| | | | * Initial draft for changelog.Gravatar Jisi Liu2016-05-10
| | | | |
| | * | | Fix the command line interface unittest againGravatar Jisi Liu2016-05-10
| | | |/ | | |/| | | | | | | | | | | | | This time move the macro inside namespaces; hopefully will work with the integration script.
| * | | Merge pull request #1513 from pherl/fix-build-protocGravatar Jisi Liu2016-05-10
| |\ \ \ | | |/ / | |/| | Fix protoc build artifact script.
| | * | Fix protoc build artifact script.Gravatar Jisi Liu2016-05-10
| |/ / | | | | | | | | | pbconfig.h has gone. This commit removes the target.
| | * Update version numbers for other languagesGravatar Jisi Liu2016-05-10
| | |
| | * Update version numbers for beta3Gravatar Jisi Liu2016-05-10
| |/
| * Merge pull request #1510 from thomasvl/nonnullGravatar Thomas Van Lenten2016-05-10
| |\ | | | | | | Declare an init and avoid passing NULL to initWithValue:count:
| | * Declare an init and avoid passing NULL to initWithValue:count:Gravatar Thomas Van Lenten2016-05-10
| | | | | | | | | | | | Fixes https://github.com/google/protobuf/issues/1189
| * | Merge pull request #1498 from thomasvl/build_cleanupGravatar Joshua Haberman2016-05-09
| |\ \ | | |/ | |/| Build cleanup
| * | Merge pull request #1502 from pherl/masterGravatar Jisi Liu2016-05-06
| |\ \ | | | | | | | | Remove accidentally restored deleted files.
| | * | Remove accidentally restored deleted files.Gravatar Jisi Liu2016-05-06
| | | |
| * | | Merge pull request #1494 from pherl/masterGravatar Jisi Liu2016-05-06
| |\| | | | | | | | | | Fix the std::string error introduced in integration.
| * | | Merge pull request #1499 from beardedN5rd/masterGravatar Feng Xiao2016-05-06
| |\ \ \ | | | | | | | | | | updated README
| | * | | after comment of Feng Xiao changed the entry to g++Gravatar beardedn5rd2016-05-06
| | | | |
| * | | | Merge pull request #1496 from ozkuran/masterGravatar Feng Xiao2016-05-06
| |\ \ \ \ | | | | | | | | | | | | Updated README.md
| | | | | * Add the missing maintiner-clean entry for benchmarksGravatar Thomas Van Lenten2016-05-06
| | | | | |
| | | | | * Properly express all outputs for the conformance buildGravatar Thomas Van Lenten2016-05-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixes up `make distclean` and `make maintainer-clean` - Fixes the build so make is more likely to notice if one of those files is stale/missing.
| | | | | * Add two missing ignores for conformance directory.Gravatar Thomas Van Lenten2016-05-06
| | |_|_|/ | |/| | |
| | | * | updated READMEGravatar beardedn5rd2016-05-06
| | | | |
| | * | | Updated README.mdGravatar Mahmut Ali ÖZKURAN2016-05-06
| |/ / / | | | | | | | | Added relative link to cmake guide.
| * | | Merge pull request #1471 from jskeet/any-hostGravatar Jon Skeet2016-05-06
| |\ \ \ | | | | | | | | | | Allow custom type URL prefixes in Any.Pack
| | | | * Fix using std::shared_ptrGravatar Jisi Liu2016-05-05
| | | | |
| | | | * Fix the std::string error introduced in integration.Gravatar Jisi Liu2016-05-05
| | |_|/ | |/| |
| * | | Merge pull request #1409 from eeight/fix_enum_corruptionGravatar Feng Xiao2016-05-04
| |\ \ \ | | | | | | | | | | Fix bug with silent message corruption in LITE_RUNTIME.
| * \ \ \ Merge pull request #1482 from nicolasnoble/rake-tweaks-2Gravatar Joshua Haberman2016-05-03
| |\ \ \ \ | | | | | | | | | | | | Properly generating well known proto files for the macos build.
| | * | | | Properly generating well known proto files for the macos build.Gravatar Nicolas "Pixel" Noble2016-05-04
| |/ / / /
| * | | | Merge pull request #1464 from google/benchmarksGravatar Joshua Haberman2016-05-03
| |\ \ \ \ | | | | | | | | | | | | Added framework for generating/consuming benchmarking data sets.
| * \ \ \ \ Merge pull request #1473 from nicolasnoble/rake-tweaksGravatar Joshua Haberman2016-05-03
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | Few tweaks to the rakefile to permit native gems compilation with the proto files generation.
| | | * | | Addressed PR comments.Gravatar Josh Haberman2016-05-03
| | | | | |
| * | | | | Merge pull request #1467 from pherl/masterGravatar Jisi Liu2016-04-30
| |\ \ \ \ \ | | | | | | | | | | | | | | Merge Google internal changes
| | | * | | | Addressing concerns.Gravatar Nicolas "Pixel" Noble2016-04-30
| | | | | | |
| | * | | | | Update descritpor protos for objcGravatar Jisi Liu2016-04-29
| | | | | | |
| * | | | | | Merge pull request #1474 from pherl/fixscriptGravatar Thomas Van Lenten2016-04-29
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix cp -r usage to be portable.
| | | * \ \ \ \ Merge the script fix.Gravatar Jisi Liu2016-04-29
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Fix cp -r usage to be portable.Gravatar Jisi Liu2016-04-29
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cp -r foo/ bar/ in linux will create a bar/foo directoy. In the objectivec generate descritpor case, well known types will be created in objectivec/google/google/protobuf/.. if the command is run under linux. Adding the trailing period fixes the behavior inconsistency.
| | | * | | | Few tweaks to the rakefile to permit native gems compilation with the proto ↵Gravatar Nicolas "Pixel" Noble2016-04-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | files generation.
| | | | * | | Fixed for pre-C++11 ifstream which does not accept std::string.Gravatar Josh Haberman2016-04-29
| | | | | | |
| | | | * | | Read files directly from filesystem since xxd isn't always available.Gravatar Josh Haberman2016-04-29
| | | | | | |
| | | | * | | Make the C++ tests build the benchmarking code.Gravatar Josh Haberman2016-04-29
| | | | | | |
| | | | * | | Updates for PR comments.Gravatar Josh Haberman2016-04-29
| | | | | | |
| | | | | | * Allow custom type URL prefixes in Any.PackGravatar Jon Skeet2016-04-29
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | (And likewise ignore the prefix in unpack.) Fixes issue #1459.
| | * | | | Update file lists.Gravatar Jisi Liu2016-04-28
| | | | | |