aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
Commit message (Expand)AuthorAgeFilesLines
* Check in php implementation. (#2052)Paul Yang2016-09-151-0/+15
* Add note about JSON tests maybe being wrong. (#1992)Thomas Van Lenten2016-08-231-0/+3
* Fix up ignores and conformance generationThomas Van Lenten2016-08-151-1/+3
* Expand the OS X/Xcode gitignoresThomas Van Lenten2016-05-191-7/+5
* Add two missing ignores for conformance directory.Thomas Van Lenten2016-05-061-0/+2
* Manually down-integrate python JSON struct support from internal code base.CH Albach2016-01-291-0/+1
* Add support for the conformance test for objc when run on OS XThomas Van Lenten2015-11-181-0/+3
* Cleanups of deps and ignores for conformanceThomas Van Lenten2015-11-161-0/+3
* Update the Mac build script to include the conformance testsThomas Van Lenten2015-11-041-0/+1
* Improved SHARED build from CMake projectKonstantin Podsvirov2015-10-151-0/+1
* Fix duplicate entry in .gitignoreDan O'Reilly2015-08-181-1/+0
* Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-121-2/+44
|\
| * Merge remote-tracking branch 'upstream/master' into proto3-onlyJon Skeet2015-06-191-1/+3
| |\
| | * Fix broken builds.Feng Xiao2015-06-171-1/+3
| * | Updates to handle use of cmake for Windows builds.Jon Skeet2015-06-171-2/+1
| |/
| * Make pbconfig.h independent of config.hJisi Liu2015-06-131-1/+0
| * ObjC fixup for the branch.Thomas Van Lenten2015-05-261-1/+2
| * Fix bugs in objective-c.Bo Yang2015-05-251-0/+3
| * Fix C2385: accessing parent classes' member without specifying is ambiguous.Bo Yang2015-05-241-0/+9
| * down-integrate internal changesBo Yang2015-05-211-0/+1
| * Merge branch 'master' of github.com:google/protobuf into integrate_from_masterJan Tattermusch2015-05-131-0/+7
| |\
| | * Merge pull request #331 from thomasvl/objc_alpha1_dropPaul Yang2015-05-061-0/+6
| | |\
| | | * Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs.Thomas Van Lenten2015-05-061-0/+6
| | * | [PYTHON] gitignore eggsTamir Duberstein2015-05-061-0/+1
| | |/
| * | Change to using xUnit for all unit tests, and fetch that via NuGet.Jon Skeet2015-04-301-0/+3
| * | Add C# files to Visual Studio projects.Jon Skeet2015-04-241-0/+5
| |/
| * `.gitignore` generated fileTamir Duberstein2015-03-311-0/+1
| * Add .so to .gitignore.Jisi Liu2015-02-281-0/+1
| * Update .gitignore so that the newly-added config.h is visible to git.Jisi Liu2015-02-251-1/+1
| * Add java compiled targets and several tests target into .gitignore.Jisi Liu2015-02-091-0/+11
* | Ignore more derived files.Tres Seaver2015-01-131-1/+2
* | Ignore .so files.Tres Seaver2015-01-131-0/+1
|/
* Ignore artifacts from autogen.shTres Seaver2014-12-091-0/+1
* Ignore files generated from new 'map*.protobuf' sources.Tres Seaver2014-11-181-0/+1
* Avoid '**/' patterns for compat w/ git < 1.8.Tres Seaver2014-11-171-7/+19
* Add .gitignore fileJohn Beard2014-10-161-0/+49