Commits · 7f2a9fb1af432a9831b3e6769905601d72c29796 · submodule / protobuf

28 Nov, 2014 1 commit
- Merge pull request #102 from fizbin/bytestring_serializable · 7f2a9fb1
  Feng Xiao authored Nov 28, 2014
```
Make ByteStrings serializable with java serialization.
```
  7f2a9fb1
27 Nov, 2014 4 commits
- Add tests for other ByteString subclasses · a32a1a76
  Daniel Martin authored Nov 27, 2014
  
  a32a1a76
- Merge pull request #109 from nsuke/tb-vim-oneof · bdcdee0a
  Feng Xiao authored Nov 27, 2014
```
Add oneof keyword to proto.vim
```
  bdcdee0a
- Merge pull request #110 from nsuke/tb-typo-cpp_extension · 7d4117c4
  Feng Xiao authored Nov 27, 2014
```
Fix typo
```
  7d4117c4
- Down-integrate from internal code base. · c25d9feb
  Feng Xiao authored Nov 27, 2014
  
  c25d9feb
26 Nov, 2014 5 commits
- Fix typo · e5a17998
  Nobuaki Sukegawa authored Nov 26, 2014
  
  e5a17998
- Add oneof keyword to proto.vim · 33bb1766
  Nobuaki Sukegawa authored Nov 25, 2014
  
  33bb1766
- Make Java TextFormat.printToUnicodeString() escape newlines. · 90f2f502
  Feng Xiao authored Nov 26, 2014
```
Fix issue #77
```
  90f2f502
- Merge pull request #106 from xfxyjwf/fix_62 · 209840ec
  Feng Xiao authored Nov 26, 2014
```
Fix javadoc warnings.
```
  209840ec
- Fix javadoc warnings. · 418ece3b
  Feng Xiao authored Nov 26, 2014
  
  418ece3b
25 Nov, 2014 7 commits
- Merge pull request #104 from pherl/master · 7d2db50b
  Jisi Liu authored Nov 25, 2014
```
Link Java Nano generator into protoc.
```
  7d2db50b
- Merge branch 'master' of github.com:google/protobuf · 241921c6
  Jisi Liu authored Nov 25, 2014
  
  241921c6
- Link Java Nano generator into protoc. · e9bbfbcd
  Jisi Liu authored Nov 25, 2014
  
  e9bbfbcd
- Fix issue 99. · 6ae3bde7
  Feng Xiao authored Nov 25, 2014
  
  6ae3bde7
- Merge pull request #103 from Ang3lus/master · 7f3a25be
  Feng Xiao authored Nov 25, 2014
```
Fix "anonymous types declared in an anonymous union are an extension" warning when using clang with -pedantic switch
```
  7f3a25be
- Fix "anonymous types declared in an anonymous union are an extension" · dd449e1c
  Łukasz Twarduś authored Nov 25, 2014
```
warning when using clang with -pedantic switch
```
  dd449e1c
- Make ByteStrings serializable with java serialization. · 5ff8dc8e
  Daniel Martin authored Nov 25, 2014
  
  5ff8dc8e
21 Nov, 2014 1 commit
- Down-integrate from internal code base. · 99aa0f9e
  Feng Xiao authored Nov 21, 2014
  
  99aa0f9e
20 Nov, 2014 5 commits
- Add nano proto authors and update LICENSE file to include Android.mk. · 49bc8c09
  Feng Xiao authored Nov 20, 2014
  
  49bc8c09
- Merge pull request #91 from xfxyjwf/android_nano · aa8ef98a
  Feng Xiao authored Nov 20, 2014
```
Merge nano proto into protobuf repository.
```
  aa8ef98a
- Fix the broken link at the bottom of javanano/README.txt · 9e65d4bf
  Feng Xiao authored Nov 20, 2014
  
  9e65d4bf
- Merge pull request #79 from xfxyjwf/license · 8a87fb8e
  Feng Xiao authored Nov 20, 2014
```
Update LICENSE to list files that aren't copyrighted by Google Inc.
```
  8a87fb8e
- Merge nano proto into protobuf repository. · 95c25918
  Feng Xiao authored Nov 20, 2014
```
Source: https://android.googlesource.com/platform/external/protobuf.git
```
  95c25918
19 Nov, 2014 1 commit
- Prepare nano proto code to be merged into protobuf repository. · cd980d1c
  Feng Xiao authored Nov 19, 2014
  
  cd980d1c
18 Nov, 2014 10 commits
- Merge pull request #89 from tseaver/ignore-map_generated_files · 6a51460b
  Feng Xiao authored Nov 18, 2014
```
Ignore files generated from new 'map*.protobuf' sources.
```
  6a51460b
- Ignore files generated from new 'map*.protobuf' sources. · e9d18bca
  Tres Seaver authored Nov 18, 2014
  
  e9d18bca
- Merge pull request #88 from tseaver/fix-class_key_must_be_declared_w_friend · db90dff8
  Feng Xiao authored Nov 18, 2014
```
Fix compiler error: "a class-key must be used when declaring a friend"
```
  db90dff8
- Fix testcase compile failure under gcc 4.6: · 4113685c
  Tres Seaver authored Nov 18, 2014
```
google/protobuf/map_test.cc:88:16: error: expected ‘;’ at end of member declaration
google/protobuf/map_test.cc:88:18: error: ‘override’ does not name a type
.
```
  4113685c
- Fix 'error: a class-key must be used when declaring a friend' compile error. · 0fab0606
  Tres Seaver authored Nov 18, 2014
  
  0fab0606
- Merge remote-tracking branch 'upstream/master' · 0eb74768
  Tres Seaver authored Nov 18, 2014
  
  0eb74768
- Merge pull request #86 from tseaver/compat_w_git_lt_1.8 · e4f063f2
  Feng Xiao authored Nov 18, 2014
```
Make .gitignore more robust
```
  e4f063f2
- Merge pull request #84 from tseaver/fix_80-avoid_INT32_MAX_MIN · 53c10293
  Feng Xiao authored Nov 18, 2014
```
Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'.
```
  53c10293
- Avoid '**/' patterns for compat w/ git < 1.8. · 113eb61e
  Tres Seaver authored Nov 17, 2014
```
Ignore generated test scaffolding files.

Exclude Python build artifacts.
```
  113eb61e
- Use 'kint32min'/'kint32max' constants, rather than defining locally. · 8b2aafe7
  Tres Seaver authored Nov 18, 2014
```
Incorporates feedback from @xfxyjwf:
https://github.com/google/protobuf/pull/84#discussion_r20474781.
```
  8b2aafe7
17 Nov, 2014 4 commits
- Exclude Python build artifacts. · 38a3dd50
  Tres Seaver authored Nov 17, 2014
  
  38a3dd50
- Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'. · 83671c05
  Tres Seaver authored Nov 17, 2014
```
Define safe constants to use when padding enums.

Fixes #80.
```
  83671c05
- Ignore generated test scaffolding files. · 706690bd
  Tres Seaver authored Nov 17, 2014
  
  706690bd
- Compat w/ git < 1.8. · e8e3a5bf
  Tres Seaver authored Nov 17, 2014
  
  e8e3a5bf
14 Nov, 2014 1 commit
- Down-integrate from internal code base (C++ maps support). · f157a565
  Feng Xiao authored Nov 14, 2014
  
  f157a565
11 Nov, 2014 1 commit
- Update LICENSE to list files that aren't copyrighted by Google Inc. · 9ae3b0b0
  Feng Xiao authored Nov 11, 2014
```
This is following what V8 does:
https://code.google.com/p/v8/source/browse/trunk/LICENSE
```
  9ae3b0b0