Commits · 4472b4ad15827c61d2759776dccadff48a973061 · submodule / protobuf

29 Aug, 2015 1 commit
- Fixed assignment syntax error. · 4472b4ad
  Josh Haberman authored Aug 29, 2015
```
Change-Id: Ifef8a300258214aae8f6b8516fbc61b7335b5724
```
  4472b4ad
28 Aug, 2015 1 commit
- Fix for https://github.com/google/protobuf/issues/758 · fc80fad9
  Josh Haberman authored Aug 28, 2015
```
Change-Id: I590b34b96c84a3ba6e094a0bd86f153147ade3d3
```
  fc80fad9
27 Aug, 2015 17 commits
- Merge pull request #765 from xfxyjwf/javadoc · 26f0c678
  Feng Xiao authored Aug 27, 2015
```
Fix javadoc errors.
```
  26f0c678
- Fix javadoc errors. · 24522490
  Feng Xiao authored Aug 27, 2015
  
  24522490
- Merge pull request #759 from TeBoring/beta-1-2 · 23408684
  Feng Xiao authored Aug 27, 2015
```
Fix Protobuf.podspec
```
  23408684
- Fix Protobuf.podspec · fe982643
  TeBoring authored Aug 27, 2015
  
  fe982643
- Merge pull request #757 from xfxyjwf/python_failure · 08575d95
  Jisi Liu authored Aug 27, 2015
```
Excludes a failing python cpp test case.
```
  08575d95
- Excludes a failing python cpp test case. · a3a2605d
  Feng Xiao authored Aug 27, 2015
  
  a3a2605d
- Make jruby use Java 3.0.0-alpha-3. · 1942a2bd
  Feng Xiao authored Aug 27, 2015
  
  1942a2bd
- Update generated file. · 8e102ad1
  Feng Xiao authored Aug 27, 2015
  
  8e102ad1
- Fix merge conflict. · fcdcf88d
  Feng Xiao authored Aug 27, 2015
  
  fcdcf88d
- Merge pull request #756 from TeBoring/beta-1 · f900837a
  Feng Xiao authored Aug 27, 2015
```
Add distribution for objc
```
  f900837a
- Update Makefile.am to include missing files. · a3312983
  Feng Xiao authored Aug 27, 2015
  
  a3312983
- Add missing files in dist. · 99e18685
  Feng Xiao authored Aug 27, 2015
  
  99e18685
- Add distribution for objc · 1c81d0f8
  Bo Yang authored Aug 27, 2015
  
  1c81d0f8
- Merge pull request #755 from pherl/beta-1 · 28595b25
  Jisi Liu authored Aug 27, 2015
```
Add bazel build/workspace into distribution.
```
  28595b25
- Add bazel build/workspace into distribution. · 4008100e
  Jisi Liu authored Aug 27, 2015
```
Change-Id: I96fbe5c84a04f5d95c5484002404fc975f2abd21
```
  4008100e
- Merge pull request #754 from xfxyjwf/changelog · 5b771ed6
  Feng Xiao authored Aug 27, 2015
```
Update change log for beta-1.
```
  5b771ed6
- Update change log for beta-1. · cc607538
  Feng Xiao authored Aug 26, 2015
  
  cc607538
26 Aug, 2015 21 commits
- Merge pull request #750 from TeBoring/beta-1 · 106f3eb9
  Paul Yang authored Aug 26, 2015
```
Fix bugs for objectivec
```
  106f3eb9
- Fix bugs for objectivec · aca5a608
  TeBoring authored Aug 26, 2015
  
  aca5a608
- Merge branch 'master' of github.com:google/protobuf into beta-1 · e94e062b
  Feng Xiao authored Aug 26, 2015
  
  e94e062b
- Merge pull request #728 from dano/py3_str_compat · c7a1f8ec
  Joshua Haberman authored Aug 26, 2015
```
Get all tests passing on Python3 (except Python3.4 cpp implementation)
```
  c7a1f8ec
- Update post_process_dist.sh · fecc3d59
  Feng Xiao authored Aug 26, 2015
```
vsproject files no longer exist.
```
  fecc3d59
- Merge pull request #751 from xfxyjwf/version_number · 08da3d49
  Feng Xiao authored Aug 26, 2015
```
Update version number.
```
  08da3d49
- Merge pull request #752 from google/jtattermusch-patch-1 · 7ecc19f0
  Feng Xiao authored Aug 26, 2015
```
Update README.md for C#
```
  7ecc19f0
- Update README.md for C# · 8fca6f83
  Jan Tattermusch authored Aug 26, 2015
  
  8fca6f83
- Update version number. · ffe92151
  Feng Xiao authored Aug 26, 2015
```
Protoc, C++ runtime and Java runtime are updated to v3.0.0-beta-1, other
languages are updated to v3.0.0-alpha-4.
```
  ffe92151
- Merge pull request #749 from xfxyjwf/mingw_endian · 047a97ff
  Feng Xiao authored Aug 26, 2015
```
Assume LITTLE_ENDIAN for windows build
```
  047a97ff
- Add a TODO to clean-up the LITTLE_ENDIAN macro. · d9f46368
  Feng Xiao authored Aug 26, 2015
  
  d9f46368
- Assume LITTLE_ENDIAN for windows build. · b47bf4c9
  Feng Xiao authored Aug 26, 2015
  
  b47bf4c9
- Merge pull request #748 from xfxyjwf/unused_typedef · d7d9accc
  Feng Xiao authored Aug 26, 2015
```
Remove an unused typedef.
```
  d7d9accc
- Remove an unused typedef. · b7bbe543
  Feng Xiao authored Aug 26, 2015
  
  b7bbe543
- Merge remote-tracking branch 'origin/master' into beta-1 · 042bfaf6
  Feng Xiao authored Aug 26, 2015
  
  042bfaf6
- Merge pull request #709 from xfxyjwf/map_bug · b00595a3
  Feng Xiao authored Aug 26, 2015
```
Fix JSON map fields parsing.
```
  b00595a3
- Merge pull request #747 from jtattermusch/sign_mismatch · 11e36b1c
  Feng Xiao authored Aug 26, 2015
```
add static cast to silence signedness comparison warning
```
  11e36b1c
- add static cast to silence signedness comparison warning · 276ce8c1
  Jan Tattermusch authored Aug 26, 2015
  
  276ce8c1
- Merge pull request #744 from xfxyjwf/cmake_linux · 66b074f4
  Feng Xiao authored Aug 26, 2015
```
Fix cmake build on linux.
```
  66b074f4
- Merge pull request #736 from jtattermusch/fix-descriptor-proto · 7e05a2d2
  Jan Tattermusch authored Aug 26, 2015
```
Backport: Change where we rename Descriptor.cs to DescriptorProtoFile.cs.
```
  7e05a2d2
- Fix cmake build on linux. · e72c751e
  Feng Xiao authored Aug 26, 2015
  
  e72c751e