1. 29 Jan, 2016 1 commit
    • Jisi Liu's avatar
      Integrate from google internal. · 5221dcbe
      Jisi Liu authored
      Java files are moved to un-do the hack in the prevous commit, which
      moved the java files to the original position for integration.
      5221dcbe
  2. 28 Jan, 2016 1 commit
    • Jisi Liu's avatar
      Undo the Java module change for integration. · cb3f4288
      Jisi Liu authored
      Moving the files to their original location, so that opensource changes
      can be picked during the internal merge. Those files will be moved into
      the correct location after merging with internal code.
      
      Note: do NOT merge this into master without the other internal
      down-integration commit.
      cb3f4288
  3. 13 Jan, 2016 1 commit
    • nmittler's avatar
      Restructuring protobuf to multiple modules · 49efe9d7
      nmittler authored
      protobuf/java will become a parent pom that will contain two modules:
      
      core - contains all of the code for the protobuf-java artifact
      util - contains all of the code for the protobuf-java-util artifact
      
      Also cleaned up various Maven warnings.
      49efe9d7
  4. 06 Jan, 2016 1 commit
  5. 21 Dec, 2015 1 commit
  6. 16 Dec, 2015 1 commit
  7. 14 Dec, 2015 1 commit
  8. 12 Dec, 2015 1 commit
  9. 06 Oct, 2015 1 commit
  10. 05 Oct, 2015 1 commit
  11. 26 Aug, 2015 1 commit
    • Feng Xiao's avatar
      Update version number. · ffe92151
      Feng Xiao authored
      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
  12. 25 Aug, 2015 1 commit