Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into proto3-only | Jon Skeet | 2015-06-19 |
|\ | |||
| * | Fix broken builds. | Feng Xiao | 2015-06-17 |
| | | |||
* | | Updates to handle use of cmake for Windows builds. | Jon Skeet | 2015-06-17 |
|/ | |||
* | Make pbconfig.h independent of config.h | Jisi Liu | 2015-06-13 |
| | | | | Change-Id: I31ead985b4ac5b02fb7558d34c1da19fd837b50a | ||
* | ObjC fixup for the branch. | Thomas Van Lenten | 2015-05-26 |
| | | | | | | | | - 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 Yang | 2015-05-25 |
| | |||
* | Fix C2385: accessing parent classes' member without specifying is ambiguous. | Bo Yang | 2015-05-24 |
| | |||
* | down-integrate internal changes | Bo Yang | 2015-05-21 |
| | |||
* | Merge branch 'master' of github.com:google/protobuf into integrate_from_master | Jan Tattermusch | 2015-05-13 |
|\ | |||
| * | Merge pull request #331 from thomasvl/objc_alpha1_drop | Paul Yang | 2015-05-06 |
| |\ | | | | | | | Objective C compiler plugin and runtime | ||
| * | | [PYTHON] gitignore eggs | Tamir Duberstein | 2015-05-06 |
| | | | |||
| | * | Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs. | Thomas Van Lenten | 2015-05-06 |
| |/ | |||
* | | Change to using xUnit for all unit tests, and fetch that via NuGet. | Jon Skeet | 2015-04-30 |
| | | | | | | | | 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 Skeet | 2015-04-24 |
|/ | | | | Also ignore Windows native build output files. | ||
* | `.gitignore` generated file | Tamir Duberstein | 2015-03-31 |
| | |||
* | Add .so to .gitignore. | Jisi Liu | 2015-02-28 |
| | | | | Change-Id: I5418606cb51a43a8cd7f91f26448cf0e8dde1016 | ||
* | Update .gitignore so that the newly-added config.h is visible to git. | Jisi Liu | 2015-02-25 |
| | | | | Change-Id: I0054c8d6f80fc71073ca70a121f1acafc12e030b | ||
* | Add java compiled targets and several tests target into .gitignore. | Jisi Liu | 2015-02-09 |
| | |||
* | Ignore artifacts from autogen.sh | Tres Seaver | 2014-12-09 |
| | |||
* | Ignore files generated from new 'map*.protobuf' sources. | Tres Seaver | 2014-11-18 |
| | |||
* | Avoid '**/' patterns for compat w/ git < 1.8. | Tres Seaver | 2014-11-17 |
| | | | | | | Ignore generated test scaffolding files. Exclude Python build artifacts. | ||
* | Add .gitignore file | John Beard | 2014-10-16 |
Includes files generated by each of: * autogen.sh * configure * make |