Commit History

Autor SHA1 Mensaxe Data
  Jon Skeet e50461d809 Pack/Unpack implementation for Any. %!s(int64=10) %!d(string=hai) anos
  Joshua Haberman 4cb0edd778 Merge pull request #772 from dano/fix_scalar_map %!s(int64=10) %!d(string=hai) anos
  Feng Xiao 63eca470fd Merge pull request #793 from kbinani/fix_redefinition_BYTE_SIZE_macro %!s(int64=10) %!d(string=hai) anos
  kbinani 9a06c8000e Rename 'BYTE_SIZE' macro to 'GOOGLE_PROTOBUF_BYTE_SIZE' %!s(int64=10) %!d(string=hai) anos
  Dan O'Reilly d9598ca55d Fix Python 3.4 cpp implementation %!s(int64=10) %!d(string=hai) anos
  Feng Xiao 0087da9d47 Merge remote-tracking branch 'origin/master' into beta-1 %!s(int64=10) %!d(string=hai) anos
  Joshua Haberman cee703d736 Merge pull request #776 from haberman/pyfix %!s(int64=10) %!d(string=hai) anos
  Josh Haberman 4472b4ad15 Fixed assignment syntax error. %!s(int64=10) %!d(string=hai) anos
  Josh Haberman fc80fad9d5 Fix for https://github.com/google/protobuf/issues/758 %!s(int64=10) %!d(string=hai) anos
  Feng Xiao f0640b5a04 Merge pull request #770 from pkasting/string_space %!s(int64=10) %!d(string=hai) anos
  Feng Xiao 69ac02a216 Merge pull request #771 from pkasting/static_init_1 %!s(int64=10) %!d(string=hai) anos
  Feng Xiao 67946e98a9 Merge pull request #569 from redivo/master %!s(int64=10) %!d(string=hai) anos
  Feng Xiao fb0af6d02e Merge pull request #768 from pkasting/time %!s(int64=10) %!d(string=hai) anos
  Peter Kasting 4f3bead537 Remove a static initializer by removing a global of non-POD type. %!s(int64=10) %!d(string=hai) anos
  Feng Xiao 47210ccd77 Merge pull request #746 from zmodem/fix_predict_macros2 %!s(int64=10) %!d(string=hai) anos
  Feng Xiao 59b360f651 Merge pull request #767 from pkasting/port %!s(int64=10) %!d(string=hai) anos
  Peter Kasting b913cbd307 Move StringSpaceUsedIncludingSelf to lite library. %!s(int64=10) %!d(string=hai) anos
  Feng Xiao 26f0c678f6 Merge pull request #765 from xfxyjwf/javadoc %!s(int64=10) %!d(string=hai) anos
  Peter Kasting d680159527 Delete kNanosPerSecond from time.cc. %!s(int64=10) %!d(string=hai) anos
  Peter Kasting 2e789bc246 Avoid #including system headers from inside a namespace. %!s(int64=10) %!d(string=hai) anos
  Feng Xiao 245224902a Fix javadoc errors. %!s(int64=10) %!d(string=hai) anos
  Feng Xiao 23408684b4 Merge pull request #759 from TeBoring/beta-1-2 %!s(int64=10) %!d(string=hai) anos
  TeBoring fe98264317 Fix Protobuf.podspec %!s(int64=10) %!d(string=hai) anos
  Jisi Liu 08575d9595 Merge pull request #757 from xfxyjwf/python_failure %!s(int64=10) %!d(string=hai) anos
  Feng Xiao a3a2605d5c Excludes a failing python cpp test case. %!s(int64=10) %!d(string=hai) anos
  Feng Xiao 1942a2bd2e Make jruby use Java 3.0.0-alpha-3. %!s(int64=10) %!d(string=hai) anos
  Feng Xiao 8e102ad158 Update generated file. %!s(int64=10) %!d(string=hai) anos
  Feng Xiao fcdcf88d8a Fix merge conflict. %!s(int64=10) %!d(string=hai) anos
  Feng Xiao f900837afa Merge pull request #756 from TeBoring/beta-1 %!s(int64=10) %!d(string=hai) anos
  Feng Xiao a3312983d6 Update Makefile.am to include missing files. %!s(int64=10) %!d(string=hai) anos