Commit message (Collapse) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | Allow bigobj for map_unittest | 2016-04-01 | ||
|/ | ||||
* | Clarified that 'nmake' must be run before 'nmake check'. | 2016-02-10 | ||
| | ||||
* | Integrate from google internal. | 2016-01-29 | ||
| | | | | | 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 | 2016-01-11 | ||
| | ||||
* | Update BUILD/cmake files. | 2015-12-28 | ||
| | | | | Change-Id: I6fa9f1b65d6c06b891aabf3f3d868364d74d727d | |||
* | Merge branch master into v3.0.0-beta-2 | 2015-12-21 | ||
|\ | ||||
* | | Down-integrate from internal code base. | 2015-12-11 | ||
| | | ||||
| * | MSVC MP flag to build with multiple processes in visual studio. | 2015-12-07 | ||
|/ | ||||
* | Rename "umbrella" to "reflection" consistently. | 2015-11-19 | ||
| | | | | This changes csharp_names.h, which will require a corresponding change in GRPC. | |||
* | Add support for POWER Linux | 2015-11-03 | ||
| | ||||
* | Merge pull request #889 from leif81/patch-1 | 2015-10-16 | ||
|\ | | | | | Fix typos in cmake README.md | |||
| * | Change back to "protobuf_BUILD_TESTS" flag | 2015-10-16 | ||
| | | | | | | 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. | |||
* | | Merge pull request #783 from podsvirov/topic-cmake-project | 2015-10-16 | ||
|\ \ | | | | | | | Improved CMake project | |||
| | * | Fix typos in cmake README.md | 2015-10-16 | ||
| |/ |/| | ||||
| * | Improved SHARED build from CMake project | 2015-10-15 | ||
| | | ||||
* | | Update cmake/README.md for #783 PR | 2015-10-09 | ||
| | | ||||
* | | First pass at generating XML documentation from .proto comments. | 2015-10-01 | ||
| | | | | | | | | | | | | 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. | |||
| * | Add CMake option protobuf_DEBUG_POSTFIX | 2015-09-17 | ||
| | | ||||
| * | Simplify testing from CMake project to "check" target | 2015-09-17 | ||
| | | ||||
| * | Improved testing from CMake project | 2015-09-16 | ||
| | | | | | | | | | | Build tests optimization Now lite-test added to CTest collection | |||
| * | Rename CMake option BUILD_SHARED_LIBS to protobuf_BUILD_SHARED_LIBS | 2015-09-15 | ||
| | | ||||
| * | Rename CMake option ZLIB to protobuf_WITH_ZLIB | 2015-09-15 | ||
| | | ||||
| * | Rename CMake option BUILD_TESTING to protobuf_BUILD_TESTS | 2015-09-15 | ||
| | | ||||
| * | Improved testing from CMake project | 2015-09-15 | ||
| | | ||||
| * | Using NEW behavior for CMP0022 in CMake project | 2015-09-01 | ||
| | | ||||
| * | Option for switching static runtime link policy with MSVC | 2015-09-01 | ||
| | | ||||
| * | Using find_package(ZLIB) with MSVC too | 2015-08-31 | ||
| | | ||||
| * | Improved configure.ac parsing | 2015-08-31 | ||
|/ | ||||
* | Fix bugs on windows | 2015-08-25 | ||
| | ||||
* | Down-integrate from internal code base. | 2015-08-23 | ||
| | ||||
* | Down-integrate from google3. | 2015-08-22 | ||
| | ||||
* | Merge branch 'master' of github.com:google/protobuf | 2015-08-21 | ||
|\ | | | | | | | Change-Id: If3fb07754a734bae610d95124528e073515ac525 | |||
* | | Down-integrate from internal branch. | 2015-08-21 | ||
| | | | | | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4 | |||
| * | Merge pull request #673 from podsvirov/topic-cmake-install | 2015-08-12 | ||
| |\ | | | | | | | Install protobuf from cmake project | |||
| * | | only link runtime libraries statically for a static build | 2015-08-12 | ||
| | | | ||||
| * | | make VS build link runtime statically | 2015-08-08 | ||
| | | | ||||
| | * | Install headers from extract_includes for all platforms | 2015-08-04 | ||
| | | | ||||
| * | | Merge pull request #653 from airtimemedia/master | 2015-08-03 | ||
| |\ \ | | | | | | | | | Various compilation fixes | |||
| | | * | Fix: comment typo | 2015-08-03 | ||
| | | | | ||||
| | | * | Install well-known type proto files from CMake project | 2015-08-03 | ||
| | | | | ||||
| | | * | CMake installation now compatible with origin FindProtobuf module | 2015-08-02 | ||
| | | | | ||||
| | | * | Parsing version from configure.ac for CMake project | 2015-08-01 | ||
| | | | | ||||
| | | * | Install protobuf from cmake project | 2015-07-31 | ||
| | |/ | |/| | | | | | | | | | | Additional export as "protobuf" package for importing from other cmake projects | |||
| | * | Set cmake include directories on library targets. | 2015-07-28 | ||
| |/ |/| | | | | | | | cmake targets that depend on these libraries will automatically have these include directories. | |||
| * | Merge pull request #629 from google/master | 2015-07-21 | ||
| |\ | |/ |/| | Integrate changes from upstream/master into csharp-experimental | |||
* | | update header list. | 2015-07-17 | ||
| | | | | | | | | Change-Id: I75459b8b6562c3ac58fa4b1e4513accdda43ad64 | |||
* | | Update make file for extra headers. | 2015-07-17 | ||
| | | | | | | | | Change-Id: Ifbc415755266ba3d0ffa5661fcd7c7d2e3b32a22 | |||
| * | Merge pull request #611 from jskeet/csharp-wrappers | 2015-07-17 | ||
| |\ | | | | | | | C# wrapper types | |||
| * \ | Merge pull request #586 from jtattermusch/csharp_names_export | 2015-07-16 | ||
| |\ \ | | | | | | | | | Export c# naming routines publicly | |||
| | | * | First part of implementing wrapper types. Not ready yet! | 2015-07-16 | ||
| | |/ | |/| |