aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Include well-known type protos in "make install".Feng Xiao2015-04-231-1/+11
* Merge pull request #287 from zhangkun83/protoc-artifacts-fixupJisi Liu2015-04-212-4/+11
|\
| * A few fix-ups.Kun Zhang2015-04-162-4/+11
* | Merge pull request #290 from xfxyjwf/wktFeng Xiao2015-04-208-21/+425
|\ \ | |/ |/|
| * Include all well-known type protos.Feng Xiao2015-04-208-21/+425
|/
* Factored conformance tests so they can run in-process.Josh Haberman2015-04-155-199/+415
* Merge pull request #284 from cfallin/issue-283Joshua Haberman2015-04-133-2/+26
|\
| * Bump gem version to release bugfix.Chris Fallin2015-04-131-1/+1
| * Fixed issue #283: crash in JSON handler cleanup.Chris Fallin2015-04-132-1/+25
|/
* Merge pull request #276 from tamird/drop-apputils-dependencyJoshua Haberman2015-04-1124-278/+132
|\
| * [PYTHON] Drop dependency on 'google.apputils'.Tamir Duberstein2015-04-1019-102/+103
| * [PYTHON] Remove awkward duplicate testsTamir Duberstein2015-04-104-165/+0
| * [PYTHON] README: explain homebrew shenanigansTamir Duberstein2015-04-101-8/+26
| * [PYTHON] Remove unnecessary `include_dir`Tamir Duberstein2015-04-101-1/+1
| * [PYTHON] Clarify API version commentTamir Duberstein2015-04-101-2/+2
|/
* Merge pull request #278 from haberman/python-travisJoshua Haberman2015-04-092-10/+19
|\
| * Export LD_LIBRARY_PATH.Josh Haberman2015-04-091-1/+2
| * Fix for current directory in Travis tests.Josh Haberman2015-04-091-2/+2
| * Added Python to Travis build and clarified setup instructions.Josh Haberman2015-04-092-10/+18
|/
* Merge pull request #271 from zhangkun83/protoc-artifact-mavenJisi Liu2015-04-093-12/+162
|\
| * Strip Mac artifactsKun Zhang2015-04-081-2/+9
| * Make the osx binary compatible with 10.7 and laterKun Zhang2015-04-081-1/+3
| * Fix osx dependency check. otool prints the file name in the first line. Shoul...Kun Zhang2015-04-071-2/+2
| * Add cross-compilation for Windows on Linux using MinGW. Check library depende...Kun Zhang2015-04-071-12/+70
| * List the platforms that we currently support. Document staging.repository.Kun Zhang2015-04-072-1/+11
| * Process to deploy artifacts for multiple platforms into a singleKun Zhang2015-04-063-2/+75
* | Merge pull request #275 from tamird/remove-useless-fileJoshua Haberman2015-04-083-665/+0
|\ \
| * | Remove useless file that doesn't loadTamir Duberstein2015-04-083-665/+0
|/ /
* | Merge gerrit/master and github/master.Feng Xiao2015-04-087-2/+871
|\ \ | |/ |/|
| * Added first version of conformance tests.Josh Haberman2015-04-087-2/+871
* | Merge pull request #264 from tamird/getbytesFeng Xiao2015-04-0225-263/+305
|\ \
| * | Clean up importsTamir Duberstein2015-04-0210-30/+17
| * | Move `UTF_8` to `Internal`Tamir Duberstein2015-04-0214-34/+33
| * | Skip 3-byte test in CITamir Duberstein2015-04-021-2/+5
| * | Run `java{,nano}` tests in CITamir Duberstein2015-04-021-2/+10
| * | DRY: Use `Charset` statics to eliminate exceptionsTamir Duberstein2015-04-0220-119/+75
| * | perf: String#getBytes(Charset) vs getBytes(String)Viktor Szathmáry2015-04-027-28/+117
| * | WhitespaceTamir Duberstein2015-04-0212-86/+86
|/ /
* | Merge pull request #269 from zhangkun83/protoc-artifact-mavenJisi Liu2015-04-022-12/+66
|\ \
| * | Document more about cross-compilation; Post-build check for the actual arch o...Kun Zhang2015-04-022-12/+66
|/ /
* | Merge pull request #268 from zhangkun83/protoc-artifact-mavenJisi Liu2015-04-023-0/+272
|\ \
| * | Fix typo in READMEKun Zhang2015-04-021-2/+2
| * | Guard cd path with quotesKun Zhang2015-04-021-1/+1
| * | Make it work on MacKun Zhang2015-04-011-2/+5
| * | Make cross-compilation possibleKun Zhang2015-04-012-1/+12
| * | Run make protoc(.exe) instead of just make, because the latter fails on Cygwi...Kun Zhang2015-04-012-9/+81
| * | Update README.mdKun Zhang2015-04-011-16/+8
| * | Move signing and uploading to the release profileKun Zhang2015-04-011-25/+34
| * | Switch from Gradle to Maven.Kun Zhang2015-03-318-372/+119
| * | Make clean before makingKun Zhang2015-03-311-1/+1