aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
Commit message (Expand)AuthorAgeFilesLines
* Add missing files to EXTRA_DIST.Feng Xiao2015-12-281-3/+5
* Down-integrate from internal code base.Feng Xiao2015-12-111-2/+6
* Rename "umbrella" to "reflection" consistently.Jon Skeet2015-11-191-2/+2
* Add support for POWER LinuxDoug Kwan2015-11-031-1/+1
* First pass at generating XML documentation from .proto comments.Jon Skeet2015-10-011-0/+2
* Down-integrate from internal code base.Feng Xiao2015-08-231-10/+31
* Merge branch 'master' of github.com:google/protobufJisi Liu2015-08-211-4/+5
|\
| * Merge pull request #629 from google/masterJon Skeet2015-07-211-0/+9
| |\
| * \ Merge pull request #611 from jskeet/csharp-wrappersJon Skeet2015-07-171-1/+3
| |\ \
| | * | First part of implementing wrapper types. Not ready yet!Jon Skeet2015-07-161-1/+3
| * | | Merge pull request #586 from jtattermusch/csharp_names_exportJan Tattermusch2015-07-161-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | export c# naming routines publiclyJan Tattermusch2015-07-101-0/+1
| * | | Merge remote-tracking branch 'upstream/master' into csharp-experimentalJan Tattermusch2015-07-151-1/+0
| |\ \ \ | | |/ / | |/| |
| * | | First pass at map support.Jon Skeet2015-06-251-0/+2
| * | | Merge remote-tracking branch 'upstream/master' into proto3-onlyJon Skeet2015-06-191-99/+201
| |\ \ \
| * \ \ \ Merged masterJon Skeet2015-06-171-23/+18
| |\ \ \ \
| * | | | | First stab at new proto3-only code generatorJon Skeet2015-06-051-5/+1
* | | | | | Down-integrate from internal branch.Jisi Liu2015-08-211-5/+26
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'master' of github.com:google/protobuf into splitheaderJisi Liu2015-07-171-0/+3
|\ \ \ \ \
| * | | | | Install missing headersRob Earhart2015-07-141-0/+3
| | |_|_|/ | |/| | |
* / | | | Update make file for extra headers.Jisi Liu2015-07-171-0/+6
|/ / / /
* | | / Internal local modifications.Bo Yang2015-07-091-1/+0
| |_|/ |/| |
* | | Merge pull request #501 from xfxyjwf/downFeng Xiao2015-06-171-99/+201
|\ \ \ | |_|/ |/| |
| * | Fix broken builds.Feng Xiao2015-06-171-15/+22
| * | Down-integrate from internal code base.Feng Xiao2015-06-151-97/+192
* | | Make the code independent of config.hJisi Liu2015-06-161-2/+10
|/ /
* | Merge pull request #495 from pherl/masterJisi Liu2015-06-131-18/+3
|\ \
| * | Make pbconfig.h independent of config.hJisi Liu2015-06-131-18/+3
* | | Merge pull request #481 from Qartar/masterFeng Xiao2015-06-121-2/+4
|\ \ \ | |/ / |/| |
| * | Workaround for MSVC's string literal compiler limit.Qartar2015-06-121-2/+4
| |/
* / Beta quality drop of Objective C Support.Thomas Van Lenten2015-06-081-1/+1
|/
* Adds objectivec_helpers.h to the headers installed by make.Jorge Canizales2015-05-261-0/+1
* Copy two data files from ruby/tests to src/google/compiler/ruby. Tests in src...Bo Yang2015-05-251-0/+2
* down-integrate internal changesBo Yang2015-05-211-0/+27
* Merge pull request #384 from google/csharpJie Luo2015-05-141-2/+33
|\
| * Merge branch 'master' of github.com:google/protobuf into integrate_from_masterJan Tattermusch2015-05-131-1/+36
| |\
| * \ Merge pull request #288 from jtattermusch/csharp_protobuf_reviewedJie Luo2015-04-171-2/+33
| |\ \
| | * | forgot to include header files into automake templateJan Tattermusch2015-04-171-1/+15
| | * | Rewrote C# protogen to C++ (initial version)Jan Tattermusch2015-03-261-2/+19
* | | | Include generated code of well-known types in protobuf C++ runtime.Feng Xiao2015-05-111-6/+30
| |_|/ |/| |
* | | Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs.Thomas Van Lenten2015-05-061-0/+25
* | | Include well-known type protos in "make install".Feng Xiao2015-04-231-1/+11
|/ /
* / Change fixture name to be consistentTamir Duberstein2015-03-311-3/+3
|/
* Revert pull request 175: Add support for the TILE-Gx processor family.Bo Yang2015-03-141-1/+0
* Add a missing proto file.Feng Xiao2015-03-131-1/+4
* Merge pull request #175 from martiert/tile-supportJisi Liu2015-03-051-0/+1
|\
| * Add support for the TILE-Gx processor family.Martin Ertsaas2015-01-221-0/+1
* | Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-281-3/+16
* | Fix the order of BUILT_FILES so that pbconfig.h will be built beforeJisi Liu2015-02-251-1/+1
* | Exclude pbconfg.h from dist, otherwise it breaks VS builds.Jisi Liu2015-02-251-3/+4