Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Clarified that 'nmake' must be run before 'nmake check'. | Josh Haberman | 2016-02-10 | 1 | -1/+2 |
| | |||||
* | Integrate from google internal. | Jisi Liu | 2016-01-29 | 1 | -0/+1 |
| | | | | | Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration. | ||||
* | Fix typos in README.md/CHANGES.txt | Dongjoon Hyun | 2016-01-11 | 1 | -3/+3 |
| | |||||
* | Update BUILD/cmake files. | Feng Xiao | 2015-12-28 | 2 | -3/+5 |
| | | | | Change-Id: I6fa9f1b65d6c06b891aabf3f3d868364d74d727d | ||||
* | Merge branch master into v3.0.0-beta-2 | Feng Xiao | 2015-12-21 | 1 | -0/+2 |
|\ | |||||
| * | MSVC MP flag to build with multiple processes in visual studio. | Benjamin Bennett | 2015-12-07 | 1 | -0/+2 |
| | | |||||
* | | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 | 3 | -0/+4 |
|/ | |||||
* | Rename "umbrella" to "reflection" consistently. | Jon Skeet | 2015-11-19 | 1 | -1/+1 |
| | | | | This changes csharp_names.h, which will require a corresponding change in GRPC. | ||||
* | Add support for POWER Linux | Doug Kwan | 2015-11-03 | 1 | -1/+1 |
| | |||||
* | Merge pull request #889 from leif81/patch-1 | Feng Xiao | 2015-10-16 | 1 | -10/+10 |
|\ | | | | | Fix typos in cmake README.md | ||||
| * | Change back to "protobuf_BUILD_TESTS" flag | Leif Gruenwoldt | 2015-10-16 | 1 | -1/+1 |
| | | | | | | In anticipation of PR #753 getting merged we'll change this back. However until that PR gets merged the old value "BUILD_TESTS" is really needed. | ||||
| * | Fix typos in cmake README.md | Leif Gruenwoldt | 2015-10-16 | 1 | -11/+11 |
| | | |||||
* | | Merge pull request #783 from podsvirov/topic-cmake-project | Feng Xiao | 2015-10-16 | 5 | -52/+108 |
|\ \ | |/ |/| | Improved CMake project | ||||
| * | Improved SHARED build from CMake project | Konstantin Podsvirov | 2015-10-15 | 4 | -27/+47 |
| | | |||||
| * | Add CMake option protobuf_DEBUG_POSTFIX | Konstantin Podsvirov | 2015-09-17 | 4 | -3/+8 |
| | | |||||
| * | Simplify testing from CMake project to "check" target | Konstantin Podsvirov | 2015-09-17 | 1 | -19/+13 |
| | | |||||
| * | Improved testing from CMake project | Konstantin Podsvirov | 2015-09-16 | 1 | -4/+11 |
| | | | | | | | | | | Build tests optimization Now lite-test added to CTest collection | ||||
| * | Rename CMake option BUILD_SHARED_LIBS to protobuf_BUILD_SHARED_LIBS | Konstantin Podsvirov | 2015-09-15 | 1 | -4/+4 |
| | | |||||
| * | Rename CMake option ZLIB to protobuf_WITH_ZLIB | Konstantin Podsvirov | 2015-09-15 | 1 | -5/+5 |
| | | |||||
| * | Rename CMake option BUILD_TESTING to protobuf_BUILD_TESTS | Konstantin Podsvirov | 2015-09-15 | 1 | -3/+3 |
| | | |||||
| * | Improved testing from CMake project | Konstantin Podsvirov | 2015-09-15 | 1 | -3/+13 |
| | | |||||
| * | Using NEW behavior for CMP0022 in CMake project | Konstantin Podsvirov | 2015-09-01 | 1 | -0/+3 |
| | | |||||
| * | Option for switching static runtime link policy with MSVC | Konstantin Podsvirov | 2015-09-01 | 1 | -7/+10 |
| | | |||||
| * | Using find_package(ZLIB) with MSVC too | Konstantin Podsvirov | 2015-08-31 | 1 | -12/+14 |
| | | |||||
| * | Improved configure.ac parsing | Konstantin Podsvirov | 2015-08-31 | 1 | -15/+27 |
| | | |||||
* | | Update cmake/README.md for #783 PR | Konstantin Podsvirov | 2015-10-09 | 1 | -76/+272 |
| | | |||||
* | | First pass at generating XML documentation from .proto comments. | Jon Skeet | 2015-10-01 | 1 | -0/+1 |
|/ | | | | | | This could be tidied up significantly, and at some point we will want to parse the markdown and generate more appropriate XML - but this is definitely better than nothing. Generated code changes coming in next commit. | ||||
* | Fix bugs on windows | Bo Yang | 2015-08-25 | 3 | -2/+1 |
| | |||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-08-23 | 1 | -4/+13 |
| | |||||
* | Down-integrate from google3. | Feng Xiao | 2015-08-22 | 3 | -131/+131 |
| | |||||
* | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2015-08-21 | 9 | -2/+320 |
|\ | | | | | | | Change-Id: If3fb07754a734bae610d95124528e073515ac525 | ||||
| * | Merge pull request #673 from podsvirov/topic-cmake-install | Feng Xiao | 2015-08-12 | 5 | -0/+302 |
| |\ | | | | | | | Install protobuf from cmake project | ||||
| | * | Install headers from extract_includes for all platforms | Konstantin Podsvirov | 2015-08-04 | 1 | -1/+1 |
| | | | |||||
| | * | Fix: comment typo | Konstantin Podsvirov | 2015-08-03 | 1 | -1/+1 |
| | | | |||||
| | * | Install well-known type proto files from CMake project | Konstantin Podsvirov | 2015-08-03 | 2 | -3/+57 |
| | | | |||||
| | * | CMake installation now compatible with origin FindProtobuf module | Konstantin Podsvirov | 2015-08-02 | 3 | -2/+156 |
| | | | |||||
| | * | Parsing version from configure.ac for CMake project | Konstantin Podsvirov | 2015-08-01 | 2 | -15/+24 |
| | | | |||||
| | * | Install protobuf from cmake project | Konstantin Podsvirov | 2015-07-31 | 4 | -0/+85 |
| | | | | | | | | | | | | | | | Additional export as "protobuf" package for importing from other cmake projects | ||||
| * | | only link runtime libraries statically for a static build | Jan Tattermusch | 2015-08-12 | 1 | -12/+13 |
| | | | |||||
| * | | make VS build link runtime statically | Jan Tattermusch | 2015-08-08 | 1 | -0/+12 |
| | | | |||||
| * | | Merge pull request #653 from airtimemedia/master | Feng Xiao | 2015-08-03 | 2 | -0/+2 |
| |\ \ | | |/ | |/| | Various compilation fixes | ||||
| | * | Set cmake include directories on library targets. | Tom Hughes | 2015-07-28 | 2 | -0/+2 |
| | | | | | | | | | | | | | | | cmake targets that depend on these libraries will automatically have these include directories. | ||||
| * | | Merge pull request #629 from google/master | Jon Skeet | 2015-07-21 | 1 | -0/+9 |
| |\| | | | | | | | Integrate changes from upstream/master into csharp-experimental | ||||
| * | | Merge pull request #611 from jskeet/csharp-wrappers | Jon Skeet | 2015-07-17 | 1 | -0/+1 |
| |\ \ | | | | | | | | | C# wrapper types | ||||
| | * | | First part of implementing wrapper types. Not ready yet! | Jon Skeet | 2015-07-16 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge pull request #586 from jtattermusch/csharp_names_export | Jan Tattermusch | 2015-07-16 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |/| | | Export c# naming routines publicly | ||||
| | * | | export c# naming routines publicly | Jan Tattermusch | 2015-07-10 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'upstream/master' into csharp-experimental | Jan Tattermusch | 2015-07-15 | 2 | -2/+1 |
| |\ \ \ | | |/ / | |/| | | |||||
| * | | | First pass at map support. | Jon Skeet | 2015-06-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | More tests required. Generated code in next commit. | ||||
| * | | | Merge remote-tracking branch 'upstream/master' into proto3-only | Jon Skeet | 2015-06-19 | 6 | -136/+77 |
| |\ \ \ |