{"shas":[["dfae2b2ce5b645cd4bb4b2a6a2cade70b9787f8c","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","Merge remote-tracking branch 'edwilde/master'\n\nConflicts:\n\tprotomak-engine/src/main/java/uk/co/jemos/protomak/engine/impl/TypeVisitor.java\n\tprotomak-engine/src/main/java/uk/co/jemos/protomak/engine/impl/XsomDefaultComplexTypeProcessor.java\n\tprotomak-engine/src/test/resources/expected-proto-files/expected-simple-one-level.proto\n\tprotomak-engine/src/test/resources/expected-proto-files/expected-single-element-with-inherited-complex-type.proto","Marco Tedone"],["e2540bae53936b850453d7cb4af73d9991a43b11","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","merged changes from Ed","Marco Tedone"],["243bedd3c791d7eefbfd49833bff5116c73cc4a5","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","PMK-23 Fixed message attribute ordering","Marco Tedone"],["afbb2acfd7671b67c0f4a358a21c504626551125","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","PMK-6 Added documentation project","Marco Tedone"],["c7e3f2dbcb3ec276e030100376629abeed2898a4","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","Merge branch 'master' of github.com:mtedone/protomak","Marco Tedone"],["456edb1990793eff14d2b220a855d0d59b49829c","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","PMK-6 Added multi-project structure for documentation","Marco Tedone"],["920a69128ab7e2377509ca4721cc3680c8b66340","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","Added instructions on how to build the docs","Marco Tedone"],["2e1bc0efad9830b0523334e161d2b298a276bbf4","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","PMK-24 Created the Protomak Maven Plugin","Marco Tedone"],["51dc27a0b142184df0b0a7cec58d3f288e36fe15","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","PMK-24 Added Maven Protomak plugin","Marco Tedone"],["812ab24239a0760fcfd1e68d85c53fdc8b85121e","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","Merge branch 'master' of git@github.com:mtedone/protomak.git","Marco Tedone"],["902b67a761a466ee2a44f8086f8ad1e7412fc003","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","PMK-24 Added distribution management information for the site\ngeneration","Marco Tedone"],["24bdde54b2e7c0611c8e6b4b69b426bcb61b19c7","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","PMK-24 Added documentation for maven-protomak-plugin","Marco Tedone"],["59329c90760f733e1ed5764a63e8813b4b5af8c0","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","PMK-24 Increased javadoc plugin version to 2.8","Marco Tedone"],["c4d18c9cc1a44d12781d623e4a0851cb91059b85","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","PMK-24 Added documentation structure","Marco Tedone"],["8bda0dade251d4ee2854819db12478bb02a10f4d","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","PMK-24 Added documentation structure","Marco Tedone"],["61d38e3daa825b1ca815b6a9da34139a0c9635dd","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","Changed protomak-documentation in protomak parent","Marco Tedone"],["f370f68abc8d0989353087df3a3e801e8097ab32","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","Replaced parent as oss nexus","Marco Tedone"],["da8be92e6e9df1438e2628e3efa5110874772651","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","Replaced parent as Nexus oss","Marco Tedone"],["7860046a21e31adb1ec6686999431da679839169","8174f518e0b729cad038424ee1979b3f7e6a03be@me.com","Added Usage.html to the site.xml as a link under Getting Started. TODO: populate usage.html","Sharat Koya"],["0d6837d6e99b6fc8c19d485f78efe0a2f59b53fb","1f2c305fa7205f2242383e31c18507c8f7efd0a8@gmail.com","Re-entered emma plugin for code coverage","Marco Tedone"]],"ref":"refs/heads/master","size":22,"head":"366bbccb13649a3d11ba25c1895820ed27a1d555","push_id":34214242}