aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1622 from ethereum/developchriseth2017-02-0166-899/+2362
|\
| * Release date for 0.4.9chriseth2017-02-011-1/+1
| * Merge pull request #1594 from ethereum/fixStdTokenchriseth2017-01-312-14/+34
| |\
| | * Fix transferFrom.chriseth2017-01-231-7/+11
| | * Make token constructible.chriseth2017-01-211-12/+24
| | * Test that all constructible std contracts produce bytecode.chriseth2017-01-211-0/+4
| * | Merge pull request #1621 from VoR0220/fixLinkerForBinariesWithImportschriseth2017-01-311-1/+3
| |\ \
| | * | fix for linker wrt binaries generated with import statementsVoR02202017-01-311-1/+3
| |/ /
| * | Merge pull request #1619 from ethereum/changelogchriseth2017-01-304-1/+24
| |\ \
| | * | Add tests for invalid instructionAlex Beregszaszi2017-01-282-0/+20
| | * | Mention invalid in docsAlex Beregszaszi2017-01-271-0/+2
| | * | Mention in changelog that invalid as an opcode is valid inline assemblyAlex Beregszaszi2017-01-271-1/+2
| |/ /
| * | Merge pull request #1598 from wuestholz/developchriseth2017-01-2714-23/+85
| |\ \
| | * | Changelog and review suggestions.chriseth2017-01-273-2/+4
| | * | Document special case of zero-initialized internal function.chriseth2017-01-261-1/+6
| | * | Uninitialized internal function should call INVALID.chriseth2017-01-261-1/+3
| | * | Allow inserting low-level functions without calling them.chriseth2017-01-262-5/+26
| | * | Split line.chriseth2017-01-261-1/+3
| | * | Fix optimizer with regards to INVALID instruction.chriseth2017-01-262-0/+2
| | * | Change code for INVALID opcode to 0xfe.chriseth2017-01-262-4/+4
| | * | Address feedback from code review.Valentin Wüstholz2017-01-265-16/+12
| | * | Change translation of implicit throws (issue #1589).Valentin Wüstholz2017-01-2610-17/+49
| * | | Merge pull request #1451 from LefterisJP/fix_buildchriseth2017-01-273-19/+123
| |\ \ \
| | * | | Changelog entry.chriseth2017-01-271-0/+1
| | * | | Tests for natspect parsing failure casesLefteris Karapetsas2017-01-271-0/+42
| | * | | Minor changes.chriseth2017-01-271-19/+17
| | * | | More verbose function namingLefteris Karapetsas2017-01-271-2/+2
| | * | | Doc tags followed by newline are now parsed properlyLefteris Karapetsas2017-01-272-3/+3
| | * | | Fix and better output for testsLefteris Karapetsas2017-01-252-1/+7
| | * | | Accept any kind of whitespace after natspec tagsLefteris Karapetsas2017-01-252-13/+70
| * | | | Merge pull request #1613 from ethereum/refactorJsonAlex Beregszaszi2017-01-275-51/+49
| |\ \ \ \
| | * | | | Refactor json return type generation.chriseth2017-01-275-51/+49
| |/ / / /
| * | | | Merge pull request #1608 from LefterisJP/archlinux_add_ethereum_gitchriseth2017-01-271-0/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add ethereum-git to archlinux dependenciesLefteris Karapetsas2017-01-261-0/+2
| | |/ /
| * | | Merge pull request #1604 from ethereum/checksumsAlex Beregszaszi2017-01-2615-18/+294
| |\ \ \
| | * | | Simplify length rule.chriseth2017-01-261-2/+2
| | * | | Add some more tests for the checksum routine.chriseth2017-01-251-0/+83
| | * | | Documentation.chriseth2017-01-251-0/+13
| | * | | Also check library addresses.chriseth2017-01-254-23/+49
| | * | | Tests for library checksums.chriseth2017-01-252-14/+53
| | * | | Warn about invalid checksums of addresses.chriseth2017-01-258-2/+117
| | |/ /
| * | | Merge pull request #1610 from ethereum/assemblyModeErrorAlex Beregszaszi2017-01-262-26/+33
| |\ \ \
| | * | | Header cleanup.chriseth2017-01-262-26/+29
| | * | | Proper error reporting for assembly mode.chriseth2017-01-261-0/+4
| | |/ /
| * | | Merge pull request #1611 from ethereum/metadata-literal-sourceschriseth2017-01-264-5/+18
| |\ \ \
| | * | | Add literal metadata sources to changelogAlex Beregszaszi2017-01-261-0/+1
| | * | | Add option to solc to use literal sources in metadtaAlex Beregszaszi2017-01-261-1/+6
| | * | | Add option to store literal sources in metadataAlex Beregszaszi2017-01-262-4/+11
| |/ / /
| * | | Merge pull request #1606 from ethereum/inlineasm-instr-shadowingAlex Beregszaszi2017-01-265-4/+33
| |\ \ \ | | |/ / | |/| |
| | * | Update error message.chriseth2017-01-262-2/+2
| | * | Disallow assignment to non-identifiers.chriseth2017-01-262-0/+8
| | * | Disallow instructions in assignment.chriseth2017-01-261-6/+5
| | * | Add test for assignment.chriseth2017-01-261-1/+7
| | * | Renamed function.chriseth2017-01-262-5/+5
| | * | Moved test.chriseth2017-01-263-15/+7
| | * | Rewording in changelog.chriseth2017-01-261-1/+1
| | * | Add test for shadowing inline assembly instructionAlex Beregszaszi2017-01-251-0/+13
| | * | Do not allow shadowing inline assembly instructions with variablesAlex Beregszaszi2017-01-253-1/+12
| |/ /
| * | Merge pull request #1595 from ethereum/noDuplicatedContractsRJ Catalano2017-01-252-14/+47
| |\ \
| | * | Include creation code only once.chriseth2017-01-251-14/+18
| | * | Test double inclusion of bytecode.chriseth2017-01-251-0/+29
| |/ /
| * | Merge pull request #1588 from ethereum/fixrecursivestructschriseth2017-01-258-457/+607
| |\ \
| | * | Use int arithmetics for stack adjustment.chriseth2017-01-241-1/+1
| | * | Change clearStorageLoop to TypePointer.chriseth2017-01-242-16/+18
| | * | Changelog entry.chriseth2017-01-241-0/+4
| | * | Use shared_ptrs to enable shared_from_this.chriseth2017-01-241-4/+4
| | * | Convert ArrayUtils routines into low-level functions.chriseth2017-01-241-228/+251
| | * | Move some util functions to low-level functions.chriseth2017-01-245-244/+320
| | * | Low level named functions for CompilerContext.chriseth2017-01-242-0/+23
| | * | Test for initializing recursive structs.chriseth2017-01-241-0/+22
| * | | Merge pull request #1600 from ethereum/functionalAsmOutchriseth2017-01-254-17/+94
| |\ \ \ | | |/ / | |/| |
| | * | Create functional assembly output, if possible.chriseth2017-01-244-17/+94
| * | | Merge pull request #1245 from ethereum/1215chriseth2017-01-245-7/+177
| |\ \ \ | | |/ / | |/| |
| | * | analysis: disallow overloading functions with eventsYoichi Hirai2017-01-231-1/+6
| | * | test: add tests about functions and events of the same nameYoichi Hirai2017-01-231-0/+47
| | * | analysis: fix formatYoichi Hirai2017-01-231-4/+7
| | * | test: add a test case about inheriting multiple events of the same nameYoichi Hirai2017-01-231-0/+52
| | * | Changelog: move an item upwardsYoichi Hirai2017-01-231-1/+1
| | * | test: somehow log counting system has changedYoichi Hirai2017-01-231-10/+10
| | * | analysis: Resolve event overloadingYoichi Hirai2017-01-232-14/+11
| | * | test: check the results of function calls in the test for multiple events of ...Yoichi Hirai2017-01-231-6/+9
| | * | test: fixing inconsistent usage of end-to-end test frameworkYoichi Hirai2017-01-231-4/+7
| | * | Changelog: add a point about allowing multiple events that share the same nameYoichi Hirai2017-01-231-0/+1
| | * | test: Add an end-to-end test about multiple events of the same nameYoichi Hirai2017-01-231-0/+41
| | * | analysis: Allow multiple events of the same nameYoichi Hirai2017-01-231-0/+7
| | * | test: Add a test for #1215Yoichi Hirai2017-01-231-0/+11
| | |/
| * | Merge pull request #1599 from ethereum/fixErrorTagLLLAlex Beregszaszi2017-01-232-1/+8
| |\ \
| | * | LLL: add test for (panic) in a sequenceAlex Beregszaszi2017-01-121-0/+7
| | * | Fix error tag usage in lll.chriseth2017-01-231-1/+1
| |/ /
| * | Merge pull request #1591 from ethereum/stackTooDeepLocationYoichi Hirai2017-01-233-3/+16
| |\ \
| | * | Report source location on "stack too deep" errors.chriseth2017-01-213-3/+16
| | |/
| * | Merge pull request #1593 from ethereum/identifierRegexYoichi Hirai2017-01-231-1/+1
| |\ \
| | * | Correct identifier regexchriseth2017-01-211-1/+1
| | |/
| * | Merge pull request #1592 from ethereum/internalConstructorsYoichi Hirai2017-01-235-2/+49
| |\ \
| | * | Check if constructor is public or not.chriseth2017-01-213-2/+13
| | * | Add tests for internal constructor.chriseth2017-01-212-0/+36
| | |/
| * | Merge pull request #1597 from sarbogast/patch-2chriseth2017-01-231-10/+10
| |\ \
| | * | Fix the list of reasons for throwing automaticallySebastien Arbogast2017-01-211-10/+10
| | |/
| * | Merge pull request #1596 from sarbogast/patch-1chriseth2017-01-231-1/+1
| |\ \ | | |/ | |/|
| | * Fixed typo on contract instanceSebastien Arbogast2017-01-211-1/+1
| |/
| * Merge pull request #1576 from ethereum/typeIdentifiersYoichi Hirai2017-01-207-20/+359
| |\
| | * Make m_id const.chriseth2017-01-201-1/+1
| | * Reset AST node IDs between compilation runs.chriseth2017-01-205-5/+28
| | * Properly escape user strings and lists.chriseth2017-01-193-56/+98
| | * Type identifiers.chriseth2017-01-194-3/+277
| * | Merge pull request #1587 from ethereum/fixFunctionVisibilityYoichi Hirai2017-01-192-2/+4
| |\ \ | | |/ | |/|
| | * Fix default function type name visibility.chriseth2017-01-192-2/+4
| |/
| * Merge pull request #1583 from federicobond/fix-commentchriseth2017-01-191-1/+1
| |\
| | * Fix typo in commentFederico Bond2017-01-181-1/+1
| * | Merge pull request #1584 from ethereum/tierchriseth2017-01-193-149/+149
| |\ \
| | * | libevmasm: remove duplicate `Tier` from `Tier::xTier`sYoichi Hirai2017-01-193-149/+149
| * | | Merge pull request #1585 from ethereum/libraryfallbackchriseth2017-01-194-21/+42
| |\ \ \ | | |_|/ | |/| |
| | * | Provide fallback for linking.chriseth2017-01-194-21/+42
| * | | Merge pull request #1581 from ethereum/fixosxchriseth2017-01-181-2/+2
| |\ \ \ | | |/ / | |/| |
| | * | Fix JSON output on macos.chriseth2017-01-181-2/+2
| * | | Merge pull request #1397 from roadriverrail/contract_collisionchriseth2017-01-1810-59/+82
| |\ \ \ | | |/ / | |/| |
| | * | Provide fall-back method for contract lookupRhett Aultman2017-01-171-1/+18
| | * | Revert "Fix contract lookup in tests"Rhett Aultman2017-01-175-10/+6
| | * | Update changelogRhett Aultman2017-01-171-0/+3
| | * | Fix bad merge artifact(?)Rhett Aultman2017-01-171-1/+1
| | * | Modify library collision testRhett Aultman2017-01-171-0/+1
| | * | Revert "Move clashing libraries to common source in test"Rhett Aultman2017-01-171-1/+2
| | * | Remove checkLibraryNameClashes()Rhett Aultman2017-01-172-37/+0
| | * | Use fully-qualified names for linking, tooRhett Aultman2017-01-173-15/+15
| | * | Remove unique error for contract collisionRhett Aultman2017-01-171-39/+10
| | * | Fix contract lookup in testsRhett Aultman2017-01-175-6/+10
| | * | Move fullyQualified() name to DeclarationRhett Aultman2017-01-172-10/+1
| | * | Stylistic correctionsRhett Aultman2017-01-173-11/+5
| | * | Move clashing libraries to common source in testRhett Aultman2017-01-171-2/+1
| | * | Push the error instead of throwing itRhett Aultman2017-01-171-10/+34
| | * | Drop ':' if the source file name is emptyRhett Aultman2017-01-171-1/+2
| | * | Only avoid collision if it's the same fileRhett Aultman2017-01-175-14/+52
| | * | Tab whitespace cleanup (again)Rhett Aultman2017-01-171-1/+2
| | * | Tidy up the error messageRhett Aultman2017-01-171-3/+3
| | * | Fix tab, drop stupid '!!!', change error message.Rhett Aultman2017-01-171-3/+3
| | * | Error out when contracts collide on nameRhett Aultman2017-01-171-0/+19
| * | | Merge pull request #1573 from ethereum/metadata-versionchriseth2017-01-176-1/+11
| |\ \ \
| | * | | Include SOL_VERSION_COMMIT/SOL_VERSION_PLATFORM in buildinfo.hAlex Beregszaszi2017-01-173-1/+6
| | * | | Store strict version number in metadata (exclude the platform)Alex Beregszaszi2017-01-174-1/+6
| | | |/ | | |/|
| * | | Merge pull request #1574 from ethereum/docs-versionchriseth2017-01-171-0/+18
| |\ \ \
| | * | | Mention how our version maps to SemverAlex Beregszaszi2017-01-171-0/+3
| | * | | Explain how version numbers are builtAlex Beregszaszi2017-01-171-0/+15
| | |/ /
| * | | Merge pull request #1575 from ethereum/docs-copyright-datechriseth2017-01-171-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Update copyright date in docsAlex Beregszaszi2017-01-171-1/+1
| |/ /
| * | Merge pull request #1570 from ethereum/astidentifierschriseth2017-01-174-2/+11
| |\ \
| | * | Deterministic AST node identifiers.chriseth2017-01-174-2/+11
| |/ /
| * / Add git submodule init to build instructions (#1569)Rhett Aultman2017-01-171-0/+5
| |/
| * Update SolidityLexer.py (#1567)Nicola2017-01-161-0/+1
| * Merge pull request #1564 from natzei/patch-1chriseth2017-01-131-1/+1
| |\
| | * Update SolidityLexer.pyNicola2017-01-131-1/+1
| |/
| * Merge pull request #1562 from ethereum/gas-tier-enum-classchriseth2017-01-133-141/+141
| |\
| | * Make enum Tier into an enum classYoichi Hirai2017-01-133-141/+141
| * | Merge pull request #1563 from ethereum/updateVersionchriseth2017-01-133-3/+5
| |\ \ | | |/ | |/|
| | * Update version to 0.4.9.chriseth2017-01-133-3/+5
| |/
* | Merge pull request #1561 from ethereum/developchriseth2017-01-1340-661/+2170
|\|
| * Update Changelog.mdchriseth2017-01-131-1/+1
| * Merge pull request #1479 from ethereum/function_variable_mixinchriseth2017-01-139-67/+190
| |\
| | * ast: events have FunctionType tooYoichi Hirai2017-01-122-8/+17
| | * analysis: use Declaration::functionType() in another locationYoichi Hirai2017-01-121-11/+4
| | * ast: add Declaration::functionType()Yoichi Hirai2017-01-123-14/+80
| | * Changelog: add a line about #1479Yoichi Hirai2017-01-121-0/+1
| | * docs: document the resriction about a function and an event of the same name,...Yoichi Hirai2017-01-121-0/+7
| | * test: allow multiple errors in modifier-function overridingYoichi Hirai2017-01-121-2/+6
| | * analysis: avoid emscripten build failureYoichi Hirai2017-01-121-3/+3
| | * analysis: changes necessary to compile std/StandardToken.solYoichi Hirai2017-01-123-12/+58
| | * analysis: allow some shadowings explicitlyYoichi Hirai2017-01-123-56/+29
| | * analysis: report errors when inheritance causes collisionYoichi Hirai2017-01-121-1/+25
| * | Merge pull request #1560 from ethereum/cmakechriseth2017-01-132-0/+39
| |\ \
| | * | Travis CI: Install latest CMakePaweł Bylica2017-01-122-0/+39
| * | | Merge pull request #1549 from ethereum/optimizeOptimizerchriseth2017-01-1312-461/+646
| |\ \ \ | | |/ / | |/| |
| | * | Minor changes from review.chriseth2017-01-134-4/+3
| | * | Changelog entry.chriseth2017-01-131-1/+2
| | * | Windows build fix.chriseth2017-01-131-0/+2
| | * | Fix match groups.chriseth2017-01-131-0/+1
| | * | Fix debug output.chriseth2017-01-131-2/+8
| | * | Optimize constant optimization.chriseth2017-01-132-37/+58
| | * | Optimise simplification rules (sort into bins).chriseth2017-01-134-394/+514
| | * | Do not evaluate strings if assertion succeeds.chriseth2017-01-131-20/+12
| | * | Optimize pattern matcher.chriseth2017-01-132-16/+22
| | * | Optimise AssemblyItem::m_data.chriseth2017-01-135-22/+59
| |/ /
| * | Merge pull request #1548 from VoR0220/remappingBugFixchriseth2017-01-124-9/+51
| |\ \
| | * | fixedVoR02202017-01-122-4/+4
| | * | added fix and a test for order independence of nested prefixingVoR02202017-01-122-2/+20
| | * | cleanupVoR02202017-01-123-16/+16
| | * | changelog entryVoR02202017-01-111-0/+2
| | * | fixed unused filepath bugVoR02202017-01-111-2/+1
| | * | much smaller helper functionVoR02202017-01-102-5/+5
| | * | can do this purely on length. Also made prefix filesystem string for more acc...VoR02202017-01-091-27/+16
| | * | fixed test and added solutionVoR02202017-01-092-5/+28
| | * | added testVoR02202017-01-091-0/+11
| * | | Merge pull request #1558 from anders94/doc-rewordingchriseth2017-01-121-2/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Re-word somewhat bumpy sentence to be more clear.Anders Brownworth2017-01-121-2/+2
| * | | Merge pull request #1555 from ethereum/chriseth-patch-1Yoichi Hirai2017-01-121-0/+3
| |\ \ \ | | |/ / | |/| |
| | * | Changelog entry about assembly outputchriseth2017-01-111-0/+3
| |/ /
| * | Merge pull request #1553 from federicobond/improve-grammarchriseth2017-01-111-5/+11
| |\ \
| | * | grammar.txt: Replace Identifier for Typename in NewExpressionFederico Bond2017-01-111-1/+1
| | * | grammar.txt: Add named function argumentsFederico Bond2017-01-111-1/+7
| | * | grammar.txt: Move StorageLocation? up to VariableDeclarationFederico Bond2017-01-111-3/+3
| |/ /
| * | Merge pull request #1330 from ethereum/assemblyDefchriseth2017-01-115-51/+1056
| |\ \
| | * | Move explanatory sections and other small changes.chriseth2017-01-091-183/+192
| | * | Typos and clarifications.chriseth2017-01-041-13/+17
| | * | More information about switch, loops and functions.chriseth2017-01-041-1/+78
| | * | Update to new assembly specification.chriseth2017-01-031-31/+381
| | * | Rename programSize to bytecodeSize.chriseth2017-01-031-1/+1
| | * | Assembly output for Assembly object.chriseth2017-01-033-51/+105
| | * | Assembly definition.chriseth2017-01-032-0/+511
| * | | Merge pull request #1542 from ethereum/publishTarballchriseth2017-01-092-36/+49
| |\ \ \ | | |_|/ | |/| |
| | * | Replace `` by $().chriseth2017-01-091-4/+3
| | * | Create source tarballs for releases.chriseth2017-01-042-36/+50
| * | | Merge pull request #1537 from ethereum/absolute-pathchriseth2017-01-074-5/+15
| |\ \ \
| | * | | Changelog: document #1537Yoichi Hirai2017-01-061-0/+1
| | * | | test: add a test importing a file name starting with a periodYoichi Hirai2017-01-041-0/+8
| | * | | interface: change absolutePath() so that ".dir" is considered as an absolute ...Yoichi Hirai2017-01-041-3/+3
| | * | | docs: clarify what are considered as absolute pathsYoichi Hirai2017-01-041-2/+3
| | |/ /
| * | | Merge pull request #1545 from federicobond/refactor-renamechriseth2017-01-051-3/+3
| |\ \ \ | | |/ / | |/| |
| | * | Rename contractName to typeName when parsing new expressionFederico Bond2017-01-051-3/+3
| * | | Merge pull request #1541 from ethereum/stabelnodejschriseth2017-01-031-0/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Require stable nodejs for deployment.chriseth2017-01-031-0/+1
| * | | Merge pull request #1474 from ethereum/event-lookup-base-namechriseth2017-01-034-9/+61
| |\ \ \
| | * | | ast, codegen: enable accessing events through contract names.Yoichi Hirai2017-01-033-9/+39
| | * | | test: add a test case for #1286Yoichi Hirai2017-01-031-0/+22
| * | | | Merge pull request #1527 from federicobond/elementarytypenameconversionchriseth2017-01-031-1/+8
| |\ \ \ \
| | * | | | Add ElementaryTypeNameExpression to grammar.txtFederico Bond2017-01-021-1/+8
| | | |_|/ | | |/| |
| * | | | Merge pull request #1538 from ethereum/multi-keyschriseth2017-01-031-2/+2
| |\ \ \ \
| | * | | | doc: rephrase the case when two remapping keys are applicableYoichi Hirai2017-01-021-2/+2
| | | |/ / | | |/| |
| * | | | Merge pull request #1526 from federicobond/docs-grammarchriseth2017-01-031-0/+9
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add parsers and grammars to documentationFederico Bond2017-01-021-0/+9
| * | | | Merge pull request #1530 from federicobond/remove-syntax-highlightingchriseth2017-01-021-0/+1
| |\ \ \ \
| | * | | | Remove wrong syntax highlighting in docsFederico Bond2016-12-291-0/+1
| | | |/ / | | |/| |
| * | | | Merge pull request #1529 from federicobond/right-shiftschriseth2017-01-021-1/+1
| |\ \ \ \
| | * | | | Add missing right-hand side expression for shiftsFederico Bond2016-12-281-1/+1
| | |/ / /
| * | | | Merge pull request #1528 from federicobond/userdefinedtypenamechriseth2017-01-021-2/+10
| |\ \ \ \
| | * | | | Add UserDefinedTypeName to grammar.txtFederico Bond2016-12-281-2/+10
| | |/ / /
| * | | | Merge pull request #1531 from ethereum/srcmapchriseth2017-01-021-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | libevmasm: OpPop() optimization keeps the source locationYoichi Hirai2016-12-301-1/+1
| |/ / /
| * | | Merge pull request #1522 from federicobond/patch-2Yoichi Hirai2016-12-271-3/+6
| |\ \ \
| | * | | Add unimplemented functions to grammarFederico Bond2016-12-271-1/+1
| | * | | Fix NumberLiteral rule for hex numbersFederico Bond2016-12-251-1/+4
| | * | | Fix StorageLocation position for ArrayTypeName rule in grammarFederico Bond2016-12-251-1/+1
| |/ / /
| * | | Merge pull request #1518 from mcoblenz/patch-2chriseth2016-12-221-2/+2
| |\ \ \
| | * | | Corrected explanation per discussion.Michael Coblenz2016-12-221-2/+2
| | * | | Clarified support for recursive creation.Michael Coblenz2016-12-211-2/+2
| | * | | Fixed misleading typoMichael Coblenz2016-12-201-1/+1
| | | |/ | | |/|
| * | | Merge pull request #1519 from federicobond/patch-1Yoichi Hirai2016-12-221-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Fix mapping syntax in docsFederico Bond2016-12-221-1/+1
| |/ /
| * | Merge pull request #1515 from ethereum/versionchriseth2016-12-163-3/+5
| |\ \ | | |/ | |/|
| | * Update develop version.chriseth2016-12-153-3/+5
| |/
* | Merge remote-tracking branch 'origin/develop' into releasechriseth2016-12-15180-3165/+6409
|\|
| * Merge pull request #1514 from ethereum/changelogchriseth2016-12-151-4/+4
| |\
| | * Update changelog for release.chriseth2016-12-151-4/+4
| |/