aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
Commit message (Expand)AuthorAgeFilesLines
* Added framework for generating/consuming benchmarking data sets.Josh Haberman2016-04-271-1/+5
* Merge pull request #1401 from jskeet/enum-casingJon Skeet2016-04-201-0/+1
|\
| * Add C# codegen changes to enum value names (mostly C++)Jon Skeet2016-04-201-0/+1
* | Merge branch 'master' of github.com:google/protobufJisi Liu2016-03-301-4/+2
|\|
| * Shrink ObjC overhead (generated size and some runtime sizes)Thomas Van Lenten2016-03-171-3/+1
| * Fix up handing of fields with leading names that should be all caps.Thomas Van Lenten2016-03-081-0/+1
| * Removed the generated Ruby file from Makefile.am.Josh Haberman2016-03-031-1/+0
* | Integrate google internal changes.Jisi Liu2016-03-301-0/+8
|/
* Rename Preconditions to ProtoPreconditionsJon Skeet2016-02-041-1/+1
* Rename GeneratedCodeInfo to GeneratedClrTypeInfoJon Skeet2016-02-041-1/+1
* Integrate from google internal.Jisi Liu2016-01-291-3/+1
* Fix tests broken by the Java directory change.Feng Xiao2016-01-141-154/+156
* Update README.md and remove INSTALL.txtFeng Xiao2016-01-061-1/+0
* Add missing files to EXTRA_DIST.Feng Xiao2015-12-281-2/+48
* Merge branch master into v3.0.0-beta-2Feng Xiao2015-12-211-1/+0
|\
| * Drop all use of OSSpinLockThomas Van Lenten2015-12-171-1/+0
* | Add new files to Makefile.amFeng Xiao2015-12-141-24/+36
* | Down-integrate from internal code base.Feng Xiao2015-12-111-4/+5
|/
* Fix dist_clean and maintainer-clean to get more generated files.Thomas Van Lenten2015-12-101-0/+1
* Merge pull request #944 from jskeet/umbrella-classnameJon Skeet2015-11-191-1/+1
|\
| * Generated code changes and manual changes for previous commit.Jon Skeet2015-11-091-1/+1
* | Cleanups of deps and ignores for conformanceThomas Van Lenten2015-11-161-0/+4
|/
* Created a new exception for JSON failures.Jon Skeet2015-11-051-0/+1
* Implement JSON parsing in C#.Jon Skeet2015-11-031-0/+5
* Merge remote-tracking branch 'origin/master' into fix-authorJisi Liu2015-10-051-0/+3
|\
| * Support enum forward decls in Objective C++Thomas Van Lenten2015-10-011-0/+1
| * Pack/Unpack implementation for Any.Jon Skeet2015-09-041-0/+2
* | Down-integrate from google internal.Jisi Liu2015-10-051-0/+2
|/
* Fix merge conflict.Feng Xiao2015-08-261-1/+0
* Merge pull request #756 from TeBoring/beta-1Feng Xiao2015-08-261-0/+1
|\
| * Add distribution for objcBo Yang2015-08-261-0/+2
* | Update Makefile.am to include missing files.Feng Xiao2015-08-261-11/+45
|\ \
| * | Add missing files in dist.Feng Xiao2015-08-261-1/+21
* | | Add bazel build/workspace into distribution.Jisi Liu2015-08-261-0/+3
| |/ |/|
* | Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-251-1/+0
|\|
| * Remove ez_setup.py from Makefile.amDan O'Reilly2015-08-201-1/+0
* | Fix bugs on windowsBo Yang2015-08-251-27/+32
|/
* Remove a redundant layer of directory hierarchy.Jon Skeet2015-08-031-1/+1
* Update Makefile.amJan Tattermusch2015-08-021-2/+2
* Rename ThrowHelper to Preconditions and make it public - we'll want to use it...Jon Skeet2015-07-301-1/+1
* remove the freeze APIJan Tattermusch2015-07-291-1/+0
* Fix typo in Makefile.amJon Skeet2015-07-221-1/+1
* Fix file lists for C#Jon Skeet2015-07-221-1/+1
* Updated csharp_EXTRA_DIST for TravisJon Skeet2015-07-171-89/+90
* updated csharp_EXTRA_DISTJan Tattermusch2015-07-161-248/+106
* Fix distcheck.Jisi Liu2015-06-181-1/+1
* Merge pull request #501 from xfxyjwf/downFeng Xiao2015-06-171-13/+14
|\
| * Down-integrate from internal code base.Feng Xiao2015-06-151-13/+14
* | Make the code independent of config.hJisi Liu2015-06-161-3/+0
|/
* Remove the file from Makefile.amJisi Liu2015-06-131-1/+0