aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAge
* Add missing includes in field mask testGravatar Jisi Liu2016-04-19
* Merge pull request #1397 from google/internal-mergeGravatar Joshua Haberman2016-04-11
|\
* | Fix to csharp_options - initialize internal_access to false.Gravatar Jon Skeet2016-04-08
| * Removed duplicated operator delete from merge conflict.Gravatar Josh Haberman2016-04-07
| * Merge branch 'master' into internal-mergeGravatar Josh Haberman2016-04-07
| |\
* | \ Merge pull request #1393 from gvaish/masterGravatar Jon Skeet2016-04-07
|\ \ \ | |_|/ |/| |
* | | Merge pull request #1392 from anandolee/masterGravatar Jie Luo2016-04-07
|\ \ \
| | * | Added support for internal_access for C#Gravatar Gaurav Vaish2016-04-07
| |/ / |/| |
| * | sync the Manually integrate changes in google3/third_partyGravatar Jie Luo2016-04-06
* | | Add more documentation for csharp_options.hGravatar Jon Skeet2016-04-06
* | | Line-wrapping changes only for C# generator codeGravatar Jon Skeet2016-04-06
* | | Merge pull request #1349 from gvaish/masterGravatar Jon Skeet2016-04-05
|\ \ \
| * | | Added access_level for typesGravatar Gaurav Vaish2016-04-05
* | | | Added deprecated option handling for objective-c generatorGravatar Oleg Vereshko2016-04-04
|/ / /
| | * Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-04-01
| | |\ | |_|/ |/| |
| | * Do not use C++11 unicode escape in unittest.Gravatar Jisi Liu2016-04-01
| | * Do not let windows.h define min/max macrosGravatar Jisi Liu2016-04-01
| | * Fix re-definition issue of winsock.h and winsock2.hGravatar Jisi Liu2016-03-31
| | * Fix WIN32 build for map_test.Gravatar Jisi Liu2016-03-31
| | * Remove export macros for classes nested in a template class.Gravatar Jisi Liu2016-03-31
| | * Fix javanano packageGravatar Jisi Liu2016-03-31
| | * Fix breakage of referring to table_ in static funcGravatar Jisi Liu2016-03-31
| | * Temporarily disable begin is fast test.Gravatar Jisi Liu2016-03-31
* | | Replace #include <iostream> with #include <ostream>Gravatar Adam Michalik2016-03-30
| | * Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-03-30
| | |\ | |_|/ |/| |
| | * Integrate google internal changes.Gravatar Jisi Liu2016-03-30
* | | Use the T() instead of NULL for the default value.Gravatar Jisi Liu2016-03-29
* | | Update coded_stream.hGravatar topillar2016-03-22
* | | Shrink ObjC overhead (generated size and some runtime sizes)Gravatar Thomas Van Lenten2016-03-17
* | | Merge pull request #1291 from sergiocampama/develGravatar Thomas Van Lenten2016-03-14
|\ \ \
* | | | Fixing compilation error when building with emscripten.Gravatar Ben Vanik2016-03-11
* | | | Merge pull request #1299 from tatraian/masterGravatar Feng Xiao2016-03-08
|\ \ \ \
| * | | | Comment has been added to fix (issue #1266)Gravatar Antal Tátrai2016-03-08
* | | | | Fix up handing of fields with leading names that should be all caps.Gravatar Thomas Van Lenten2016-03-08
* | | | | HeaderDoc support in the library and generated sourcesGravatar Thomas Van Lenten2016-03-07
| * | | | Fix compiling clang/libc++ builds. (Issue: #1266)Gravatar Antal Tátrai2016-03-05
|/ / / /
* | | / Generate well-known types in Ruby extension and prune unneeded proto2 depende...Gravatar Josh Haberman2016-03-03
| |_|/ |/| |
| * | Adds more information to Objective C error when the expected objc_class_prefi...Gravatar Sergio Campama2016-03-03
|/ /
* | Merge pull request #1260 from legrosbuffle/masterGravatar Paul Yang2016-03-02
|\ \
* | | Fix CommonJS relative require generation, and test itGravatar murgatroid992016-02-24
* | | Merge pull request #804 from bsilver8192/masterGravatar Feng Xiao2016-02-22
|\ \ \
* \ \ \ Merge pull request #1215 from haberman/commonjsGravatar Joshua Haberman2016-02-19
|\ \ \ \
| | | * | Make cpp generated enum constants constexpr when Options::proto_h isGravatar Clement Courbet2016-02-19
* | | | | Support ObjC Generic CollectionsGravatar Thomas Van Lenten2016-02-18
| |_|/ / |/| | |
| * | | Fixed definition of extensions, and added CommonJS tests to Travis.Gravatar Josh Haberman2016-02-18
| * | | Fixed nested message scopes for CommonJS.Gravatar Josh Haberman2016-02-18
| * | | CommonJS tests are now passing.Gravatar Josh Haberman2016-02-18
| * | | WIP.Gravatar Josh Haberman2016-02-18
|/ / /
* | | Merge pull request #260 from ejsd1989/issue-#242Gravatar Joshua Haberman2016-02-16
|\ \ \
* \ \ \ Merge pull request #1144 from dongjoon-hyun/remove_redundant_theGravatar Joshua Haberman2016-02-11
|\ \ \ \