Commit History

Autor SHA1 Mensaxe Data
  Bo Yang c6fa9c71a5 Auto-generate proto files for tests. %!s(int64=9) %!d(string=hai) anos
  Paul Yang e0e54661f7 Check in php implementation. (#2052) %!s(int64=9) %!d(string=hai) anos
  Thomas Van Lenten 80f65d2df8 Add note about JSON tests maybe being wrong. (#1992) %!s(int64=9) %!d(string=hai) anos
  Thomas Van Lenten 81564101ee Fix up ignores and conformance generation %!s(int64=9) %!d(string=hai) anos
  Thomas Van Lenten daec44fa52 Expand the OS X/Xcode gitignores %!s(int64=9) %!d(string=hai) anos
  Thomas Van Lenten f367642103 Add two missing ignores for conformance directory. %!s(int64=9) %!d(string=hai) anos
  CH Albach 5477f8cdba Manually down-integrate python JSON struct support from internal code base. %!s(int64=10) %!d(string=hai) anos
  Thomas Van Lenten 1745f7eae9 Add support for the conformance test for objc when run on OS X %!s(int64=10) %!d(string=hai) anos
  Thomas Van Lenten 42f2eee932 Cleanups of deps and ignores for conformance %!s(int64=10) %!d(string=hai) anos
  Thomas Van Lenten f0411ec974 Update the Mac build script to include the conformance tests %!s(int64=10) %!d(string=hai) anos
  Konstantin Podsvirov c3aa4c2675 Improved SHARED build from CMake project %!s(int64=10) %!d(string=hai) anos
  Dan O'Reilly 4fefc07ec5 Fix duplicate entry in .gitignore %!s(int64=10) %!d(string=hai) anos
  Dan O'Reilly e47cdd5a55 Merge remote-tracking branch 'upstream/master' into py2_py3_straddle %!s(int64=10) %!d(string=hai) anos
  Jon Skeet 50a3a809e8 Merge remote-tracking branch 'upstream/master' into proto3-only %!s(int64=10) %!d(string=hai) anos
  Feng Xiao 818c5eee08 Fix broken builds. %!s(int64=10) %!d(string=hai) anos
  Jon Skeet 09f3f4eec3 Updates to handle use of cmake for Windows builds. %!s(int64=10) %!d(string=hai) anos
  Jisi Liu f48dca5044 Make pbconfig.h independent of config.h %!s(int64=10) %!d(string=hai) anos
  Thomas Van Lenten 58cd4a47e8 ObjC fixup for the branch. %!s(int64=10) %!d(string=hai) anos
  Bo Yang 50a765ba03 Fix bugs in objective-c. %!s(int64=10) %!d(string=hai) anos
  Bo Yang f87e5b7e74 Fix C2385: accessing parent classes' member without specifying is ambiguous. %!s(int64=10) %!d(string=hai) anos
  Bo Yang 5db217305f down-integrate internal changes %!s(int64=10) %!d(string=hai) anos
  Jan Tattermusch 4111310830 Merge branch 'master' of github.com:google/protobuf into integrate_from_master %!s(int64=10) %!d(string=hai) anos
  Paul Yang b89de5f6e0 Merge pull request #331 from thomasvl/objc_alpha1_drop %!s(int64=10) %!d(string=hai) anos
  Tamir Duberstein 6d3e61676a [PYTHON] gitignore eggs %!s(int64=10) %!d(string=hai) anos
  Thomas Van Lenten 30650d81d9 Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs. %!s(int64=10) %!d(string=hai) anos
  Jon Skeet c56475088d Change to using xUnit for all unit tests, and fetch that via NuGet. %!s(int64=10) %!d(string=hai) anos
  Jon Skeet 8d7e9433b3 Add C# files to Visual Studio projects. %!s(int64=10) %!d(string=hai) anos
  Tamir Duberstein b63d432add `.gitignore` generated file %!s(int64=10) %!d(string=hai) anos
  Jisi Liu 1939efed2d Add .so to .gitignore. %!s(int64=11) %!d(string=hai) anos
  Jisi Liu c2f2bce6af Update .gitignore so that the newly-added config.h is visible to git. %!s(int64=11) %!d(string=hai) anos