aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Makefile.am
Commit message (Expand)AuthorAge
* Down-integrate from internal code base.Gravatar Feng Xiao2015-08-23
* Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2015-08-21
|\
* | Down-integrate from internal branch.Gravatar Jisi Liu2015-08-21
| * Merge pull request #629 from google/masterGravatar Jon Skeet2015-07-21
| |\ | |/ |/|
* | Merge branch 'master' of github.com:google/protobuf into splitheaderGravatar Jisi Liu2015-07-17
|\ \
* | | Update make file for extra headers.Gravatar Jisi Liu2015-07-17
| | * Merge pull request #611 from jskeet/csharp-wrappersGravatar Jon Skeet2015-07-17
| | |\
| | * \ Merge pull request #586 from jtattermusch/csharp_names_exportGravatar Jan Tattermusch2015-07-16
| | |\ \
| | | | * First part of implementing wrapper types. Not ready yet!Gravatar Jon Skeet2015-07-16
| | | |/ | | |/|
| | * | Merge remote-tracking branch 'upstream/master' into csharp-experimentalGravatar Jan Tattermusch2015-07-15
| | |\ \ | |_|/ / |/| | |
| * | | Install missing headersGravatar Rob Earhart2015-07-14
|/ / /
| | * export c# naming routines publiclyGravatar Jan Tattermusch2015-07-10
| |/
* | Internal local modifications.Gravatar Bo Yang2015-07-09
| * First pass at map support.Gravatar Jon Skeet2015-06-25
| * Merge remote-tracking branch 'upstream/master' into proto3-onlyGravatar Jon Skeet2015-06-19
| |\ | |/ |/|
* | Merge pull request #501 from xfxyjwf/downGravatar Feng Xiao2015-06-17
|\ \
| * | Fix broken builds.Gravatar Feng Xiao2015-06-17
| | * Merged masterGravatar Jon Skeet2015-06-17
| | |\ | |_|/ |/| |
* | | Make the code independent of config.hGravatar Jisi Liu2015-06-16
| * | Down-integrate from internal code base.Gravatar Feng Xiao2015-06-15
|/ /
* | Merge pull request #495 from pherl/masterGravatar Jisi Liu2015-06-13
|\ \
| * | Make pbconfig.h independent of config.hGravatar Jisi Liu2015-06-13
* | | Merge pull request #481 from Qartar/masterGravatar Feng Xiao2015-06-12
|\ \ \ | |/ / |/| |
| * | Workaround for MSVC's string literal compiler limit.Gravatar Qartar2015-06-12
* | | Beta quality drop of Objective C Support.Gravatar Thomas Van Lenten2015-06-08
|/ /
| * First stab at new proto3-only code generatorGravatar Jon Skeet2015-06-05
|/
* Adds objectivec_helpers.h to the headers installed by make.Gravatar Jorge Canizales2015-05-26
* Copy two data files from ruby/tests to src/google/compiler/ruby. Tests in src...Gravatar Bo Yang2015-05-25
* down-integrate internal changesGravatar Bo Yang2015-05-21
* Merge pull request #384 from google/csharpGravatar Jie Luo2015-05-14
|\
| * Merge branch 'master' of github.com:google/protobuf into integrate_from_masterGravatar Jan Tattermusch2015-05-13
| |\
* | | Include generated code of well-known types in protobuf C++ runtime.Gravatar Feng Xiao2015-05-11
| |/ |/|
* | Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs.Gravatar Thomas Van Lenten2015-05-06
* | Include well-known type protos in "make install".Gravatar Feng Xiao2015-04-23
| * Merge pull request #288 from jtattermusch/csharp_protobuf_reviewedGravatar Jie Luo2015-04-17
|/|
| * forgot to include header files into automake templateGravatar Jan Tattermusch2015-04-17
* | Change fixture name to be consistentGravatar Tamir Duberstein2015-03-31
| * Rewrote C# protogen to C++ (initial version)Gravatar Jan Tattermusch2015-03-26
|/
* Revert pull request 175: Add support for the TILE-Gx processor family.Gravatar Bo Yang2015-03-14
* Add a missing proto file.Gravatar Feng Xiao2015-03-13
* Merge pull request #175 from martiert/tile-supportGravatar Jisi Liu2015-03-05
|\
* | Down integrate from Google internal branch for C++ and Java.Gravatar Jisi Liu2015-02-28
* | Fix the order of BUILT_FILES so that pbconfig.h will be built beforeGravatar Jisi Liu2015-02-25
* | Exclude pbconfg.h from dist, otherwise it breaks VS builds.Gravatar Jisi Liu2015-02-25
* | Merge pull request #221 from google/python_proto3Gravatar Jisi Liu2015-02-25
|\ \
| * | Fixes for Python/C++ implementation in open-source:Gravatar Josh Haberman2015-02-25
* | | Include shared_ptr.h into headers to make maps proto work. It is usedGravatar Jisi Liu2015-02-25
* | | Make maps fields work on installed C++ protobufs.Gravatar Jisi Liu2015-02-25
|/ /
* | Merge pull request #204 from pherl/masterGravatar Jisi Liu2015-02-17
|\ \
| * | Initial checkin for maps support in JavaNano.Gravatar Jisi Liu2015-01-30