1081 Commits (7f2a9fb1af432a9831b3e6769905601d72c29796)
 

Author SHA1 Message Date
Feng Xiao 7f2a9fb1af Merge pull request #102 from fizbin/bytestring_serializable 10 years ago
Daniel Martin a32a1a761b Add tests for other ByteString subclasses 10 years ago
Feng Xiao bdcdee0a1d Merge pull request #109 from nsuke/tb-vim-oneof 10 years ago
Feng Xiao 7d4117c412 Merge pull request #110 from nsuke/tb-typo-cpp_extension 10 years ago
Feng Xiao c25d9feb4d Down-integrate from internal code base. 10 years ago
Nobuaki Sukegawa e5a17998cc Fix typo 10 years ago
Nobuaki Sukegawa 33bb176603 Add oneof keyword to proto.vim 10 years ago
Feng Xiao 90f2f50233 Make Java TextFormat.printToUnicodeString() escape newlines. 10 years ago
Feng Xiao 209840eca7 Merge pull request #106 from xfxyjwf/fix_62 10 years ago
Feng Xiao 418ece3bd1 Fix javadoc warnings. 10 years ago
Jisi Liu 7d2db50b21 Merge pull request #104 from pherl/master 10 years ago
Jisi Liu 241921c666 Merge branch 'master' of github.com:google/protobuf 10 years ago
Jisi Liu e9bbfbcd38 Link Java Nano generator into protoc. 10 years ago
Feng Xiao 6ae3bde73d Fix issue 99. 10 years ago
Feng Xiao 7f3a25bebd Merge pull request #103 from Ang3lus/master 10 years ago
Łukasz Twarduś dd449e1c79 Fix "anonymous types declared in an anonymous union are an extension" 10 years ago
Daniel Martin 5ff8dc8e00 Make ByteStrings serializable with java serialization. 10 years ago
Feng Xiao 99aa0f9e8f Down-integrate from internal code base. 10 years ago
Feng Xiao 49bc8c0963 Add nano proto authors and update LICENSE file to include Android.mk. 10 years ago
Feng Xiao aa8ef98a1f Merge pull request #91 from xfxyjwf/android_nano 10 years ago
Feng Xiao 9e65d4bfb3 Fix the broken link at the bottom of javanano/README.txt 10 years ago
Feng Xiao 8a87fb8ecf Merge pull request #79 from xfxyjwf/license 10 years ago
Feng Xiao 95c25918aa Merge nano proto into protobuf repository. 10 years ago
Feng Xiao cd980d1c13 Prepare nano proto code to be merged into protobuf repository. 10 years ago
Feng Xiao 6a51460b98 Merge pull request #89 from tseaver/ignore-map_generated_files 10 years ago
Tres Seaver e9d18bca28 Ignore files generated from new 'map*.protobuf' sources. 10 years ago
Feng Xiao db90dff872 Merge pull request #88 from tseaver/fix-class_key_must_be_declared_w_friend 10 years ago
Tres Seaver 4113685cdd Fix testcase compile failure under gcc 4.6: 10 years ago
Tres Seaver 0fab06062f Fix 'error: a class-key must be used when declaring a friend' compile error. 10 years ago
Tres Seaver 0eb74768d0 Merge remote-tracking branch 'upstream/master' 10 years ago
Feng Xiao e4f063f263 Merge pull request #86 from tseaver/compat_w_git_lt_1.8 10 years ago
Feng Xiao 53c1029362 Merge pull request #84 from tseaver/fix_80-avoid_INT32_MAX_MIN 10 years ago
Tres Seaver 113eb61e6b Avoid '**/' patterns for compat w/ git < 1.8. 10 years ago
Tres Seaver 8b2aafe7d3 Use 'kint32min'/'kint32max' constants, rather than defining locally. 10 years ago
Tres Seaver 38a3dd502d Exclude Python build artifacts. 10 years ago
Tres Seaver 83671c0514 Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'. 10 years ago
Tres Seaver 706690bddb Ignore generated test scaffolding files. 10 years ago
Tres Seaver e8e3a5bf96 Compat w/ git < 1.8. 10 years ago
Feng Xiao f157a5651c Down-integrate from internal code base (C++ maps support). 10 years ago
Feng Xiao 9ae3b0b07c Update LICENSE to list files that aren't copyrighted by Google Inc. 10 years ago
Feng Xiao faf581d208 Merge pull request #69 from apaprocki/aix-atomicops 10 years ago
Andrew Paprocki af88ccb5fc Modify tests to compile on AIX with xlC compiler. 10 years ago
Andrew Paprocki 1ddf6937ee Added contributor and updated README to add AIX. 10 years ago
Andrew Paprocki ebb41981c8 Add atomicops for AIX/POWER + IBM xlC compiler. 10 years ago
Dan Albert 6dc3924536 Merge "Add platform versions of the protobuf libraries." 10 years ago
Dan Albert 68e7e78257 Add platform versions of the protobuf libraries. 10 years ago
Feng Xiao 643d09ac7d Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobuf into typo 10 years ago
Feng Xiao 6ef984af4b Down-integrate from internal code base. 10 years ago
Veres Lajos c76807211a typo fixes - https://github.com/vlajos/misspell_fixer 10 years ago
Feng Xiao baca1a8a1a Adds more checks before deleting temporary files. 10 years ago