aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | - Hopefully complete the deps for other languages for the generated conformance proto sources. - List the generated sources for cleanup by make's clean rules. - Make the toplevel nuke the pyc files that can get created in the ObjC dir.
* Update the Mac build script to include the conformance testsThomas Van Lenten2015-11-041-0/+1
| | | | | - Kick off the conformance tests - Add missing ignore for something generated by a build on the conformance directory.
* Improved SHARED build from CMake projectKonstantin Podsvirov2015-10-151-0/+1
|
* Fix duplicate entry in .gitignoreDan O'Reilly2015-08-181-1/+0
| | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
* Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-121-2/+44
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: python/google/protobuf/descriptor_pool.py python/google/protobuf/internal/api_implementation_default_test.py python/google/protobuf/internal/cpp_message.py python/google/protobuf/internal/descriptor_database_test.py python/google/protobuf/internal/descriptor_pool_test.py python/google/protobuf/internal/descriptor_python_test.py python/google/protobuf/internal/descriptor_test.py python/google/protobuf/internal/generator_test.py python/google/protobuf/internal/message_factory_python_test.py python/google/protobuf/internal/message_factory_test.py python/google/protobuf/internal/message_test.py python/google/protobuf/internal/proto_builder_test.py python/google/protobuf/internal/python_message.py python/google/protobuf/internal/reflection_test.py python/google/protobuf/internal/service_reflection_test.py python/google/protobuf/internal/symbol_database_test.py python/google/protobuf/internal/text_encoding_test.py python/google/protobuf/internal/text_format_test.py python/google/protobuf/internal/unknown_fields_test.py python/google/protobuf/internal/wire_format_test.py python/google/protobuf/pyext/descriptor_cpp2_test.py python/google/protobuf/pyext/message_factory_cpp2_test.py python/google/protobuf/pyext/reflection_cpp2_generated_test.py python/setup.py ruby/lib/google/protobuf/message_exts.rb
| * 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
| | | | | | | | Change-Id: I31ead985b4ac5b02fb7558d34c1da19fd837b50a
| * ObjC fixup for the branch.Thomas Van Lenten2015-05-261-1/+2
| | | | | | | | | | | | | | | | - Shouldn't need SRCROOT in the project since Xcode should be setting the working directory to where the project lives. - Remove the packed/unpacked repeated enum field in the tests and update the code to handle the defaults. - Move up the ignore to cover .DS_Store files in src also. add starstar
| * 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
| | |\ | | | | | | | | Objective C compiler plugin and runtime
| | | * 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
| | | | | | | | | | | | This includes fetching the VS unit test runner package, so that tests can be run from Visual Studio's Test Explorer.
| * | Add C# files to Visual Studio projects.Jon Skeet2015-04-241-0/+5
| |/ | | | | | | Also ignore Windows native build output files.
| * `.gitignore` generated fileTamir Duberstein2015-03-311-0/+1
| |
| * Add .so to .gitignore.Jisi Liu2015-02-281-0/+1
| | | | | | | | Change-Id: I5418606cb51a43a8cd7f91f26448cf0e8dde1016
| * Update .gitignore so that the newly-added config.h is visible to git.Jisi Liu2015-02-251-1/+1
| | | | | | | | Change-Id: I0054c8d6f80fc71073ca70a121f1acafc12e030b
| * 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
| | | | | | Ignore generated test scaffolding files. Exclude Python build artifacts.
* Add .gitignore fileJohn Beard2014-10-161-0/+49
Includes files generated by each of: * autogen.sh * configure * make