Commit History

Upphovsman SHA1 Meddelande Datum
  Feng Xiao 9e9ca4b60a Merge pull request #105 from xfxyjwf/fix_92 11 år sedan
  Feng Xiao e559b51b8d Merge pull request #81 from xfxyjwf/syntax_warning 11 år sedan
  Feng Xiao 7f2a9fb1af Merge pull request #102 from fizbin/bytestring_serializable 11 år sedan
  Daniel Martin a32a1a761b Add tests for other ByteString subclasses 11 år sedan
  Feng Xiao bdcdee0a1d Merge pull request #109 from nsuke/tb-vim-oneof 11 år sedan
  Feng Xiao 7d4117c412 Merge pull request #110 from nsuke/tb-typo-cpp_extension 11 år sedan
  Feng Xiao c25d9feb4d Down-integrate from internal code base. 11 år sedan
  Nobuaki Sukegawa e5a17998cc Fix typo 11 år sedan
  Nobuaki Sukegawa 33bb176603 Add oneof keyword to proto.vim 11 år sedan
  Feng Xiao 90f2f50233 Make Java TextFormat.printToUnicodeString() escape newlines. 11 år sedan
  Feng Xiao 209840eca7 Merge pull request #106 from xfxyjwf/fix_62 11 år sedan
  Feng Xiao 418ece3bd1 Fix javadoc warnings. 11 år sedan
  Feng Xiao d1ec493a12 Fix Python C++ implementation build issues: 11 år sedan
  Jisi Liu 7d2db50b21 Merge pull request #104 from pherl/master 11 år sedan
  Jisi Liu 241921c666 Merge branch 'master' of github.com:google/protobuf 11 år sedan
  Jisi Liu e9bbfbcd38 Link Java Nano generator into protoc. 11 år sedan
  Feng Xiao 6ae3bde73d Fix issue 99. 11 år sedan
  Feng Xiao 7f3a25bebd Merge pull request #103 from Ang3lus/master 11 år sedan
  Łukasz Twarduś dd449e1c79 Fix "anonymous types declared in an anonymous union are an extension" 11 år sedan
  Daniel Martin 5ff8dc8e00 Make ByteStrings serializable with java serialization. 11 år sedan
  Feng Xiao 99aa0f9e8f Down-integrate from internal code base. 11 år sedan
  Feng Xiao 49bc8c0963 Add nano proto authors and update LICENSE file to include Android.mk. 11 år sedan
  Feng Xiao aa8ef98a1f Merge pull request #91 from xfxyjwf/android_nano 11 år sedan
  Feng Xiao 9e65d4bfb3 Fix the broken link at the bottom of javanano/README.txt 11 år sedan
  Feng Xiao 8a87fb8ecf Merge pull request #79 from xfxyjwf/license 11 år sedan
  Feng Xiao 95c25918aa Merge nano proto into protobuf repository. 11 år sedan
  Feng Xiao cd980d1c13 Prepare nano proto code to be merged into protobuf repository. 11 år sedan
  Feng Xiao 6a51460b98 Merge pull request #89 from tseaver/ignore-map_generated_files 11 år sedan
  Tres Seaver e9d18bca28 Ignore files generated from new 'map*.protobuf' sources. 11 år sedan
  Feng Xiao db90dff872 Merge pull request #88 from tseaver/fix-class_key_must_be_declared_w_friend 11 år sedan