aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.am
Commit message (Expand)AuthorAgeFilesLines
* Fix failing tests.Feng Xiao2018-08-091-0/+5
* Merge master branch.Feng Xiao2018-08-081-3/+3
|\
| * Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-08-011-3/+3
| |\
| | * Updated version numbers to 3.6.1Adam Cozzette2018-07-271-3/+3
| | * Remove js_embed binary. (#4709)Feng Xiao2018-07-161-20/+1
* | | Down-integrate from google3.Feng Xiao2018-08-081-1/+8
|/ /
* | Delete unused files. (#4942)Feng Xiao2018-07-191-4/+0
* | Add -Og to no-warning-test (#4830)Paul Yang2018-06-281-1/+1
* | Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-06-251-3/+3
|\|
| * Update version number to 3.6.0Jisi Liu2018-05-141-3/+3
* | Remove js_embed binary. (#4709)Feng Xiao2018-06-011-20/+1
|/
* Include googletest as a submodule (#3993)Carlos O'Ryan2018-03-261-23/+27
* Remove javanano.Feng Xiao2018-03-261-24/+0
* Removed some unused C++ source filesAdam Cozzette2018-03-221-2/+0
* Added new test source files to Makefile.amAdam Cozzette2018-03-201-0/+4
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-25/+2
* Remove the use of BUILT_SOURCESFeng Xiao2018-01-241-4/+4
* Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-031-3/+4
|\
| * Update version number to 3.5.1Jisi Liu2017-12-191-3/+3
| * Create containing directory before generating well_known_types_embed.ccOleg Kolosov2017-12-131-0/+1
* | Merge branch 'master' into down-integrateAdam Cozzette2017-12-011-7/+3
|\ \
| * | Merge branch '3.5.x' into 3.5.x-mergeAdam Cozzette2017-11-301-4/+3
| |\|
| | * Fix Atomic32/AtomicWord on some platforms.Jisi Liu2017-11-081-1/+0
| | * Update version number to 3.5.0Jisi Liu2017-11-021-3/+3
| * | Move C#-only test protos to csharp/protosJon Skeet2017-11-121-3/+0
| |/
* / Integrated internal changes from GoogleAdam Cozzette2017-12-011-0/+2
|/
* Merge from google internalJisi Liu2017-10-181-0/+2
* Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-111-2/+8
|\
| * Make distcheck aware of test proto files.Jisi Liu2017-08-231-2/+8
* | Integrated internal changes from GoogleAdam Cozzette2017-09-141-0/+3
|/
* Make no warning test stricter.Jisi Liu2017-08-101-12/+7
* Make code free of missing-field-initializers warningsv3.4.0rc2Jisi Liu2017-08-091-1/+2
* Fix invalid offsetof warning.Jisi Liu2017-08-031-1/+1
* Fix makefile.amJisi Liu2017-07-251-0/+3
* Fix build filesJisi Liu2017-07-251-0/+3
* Merge from masterJisi Liu2017-07-251-1/+2
* Update version number for 3.4.0Jisi Liu2017-07-241-3/+3
* Fix distcheckJisi Liu2017-07-191-0/+1
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-7/+5
* Update version number and changelog for 3.3.0Feng Xiao2017-04-051-3/+3
* Fix C++ distcheck.Feng Xiao2017-03-301-0/+2
* Down-integrate from google3.Feng Xiao2017-03-291-13/+30
* migrate delimited messages functions to util packageByron Yi2017-03-161-0/+3
* Hide unnecessary exported library symbolsAlexandros Frantzis2017-03-131-0/+15
* Detect if Descriptor.cs changes for csharpJie Luo2017-03-021-0/+1
* Switch to gcc atomic intrinsics for macOS and delete the file that uses (#2699)Jonathan Hseu2017-02-101-1/+0
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-3/+3
* Fixed "make distcheck" for the Autotools buildAdam Cozzette2017-01-091-2/+4
* Fixed cross compilations with the Autotools buildAdam Cozzette2017-01-031-3/+6
* Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned upAdam Cozzette2016-12-201-1/+2