aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unnecessary contractsDenton Liu2016-08-199-64/+2
* Update std importsDenton Liu2016-08-191-0/+2
* Add ExampleTokenDenton Liu2016-08-191-0/+55
* Add Token contractDenton Liu2016-08-191-0/+11
* Change importsDenton Liu2016-08-195-15/+15
* Add back standard contractsDenton Liu2016-08-1911-0/+85
* Remove standard contractsDenton Liu2016-08-1911-54/+16
* Merge pull request #919 from asinyagin/developchriseth2016-08-193-14/+275
|\
| * Rename root AST JSON node to SourceUnitAlex Sinyagin2016-08-182-3/+3
| * Do not add children to EnumValue and PlaceholderStatement elements in JSON ASTAlex Sinyagin2016-08-181-4/+2
| * Use the full names for JSON AST nodesAlex Sinyagin2016-08-182-19/+19
| * Move creation of the root element of JSON AST to the SourceUnit visitorAlex Sinyagin2016-08-182-5/+18
| * Add ast json converter for PlaceholderStatementAlex Sinyagin2016-08-183-0/+26
| * Add ast json converter for ArrayTypeNameAlex Sinyagin2016-08-183-0/+26
| * Add ast json converter for ModifierInvocation and EventDefinitionAlex Sinyagin2016-08-183-0/+56
| * Add ast json converter for ModifierDefinitionAlex Sinyagin2016-08-183-0/+27
| * Add ast json converter for EnumValueAlex Sinyagin2016-08-183-0/+30
| * Add ast json converter for EnumDefinitionAlex Sinyagin2016-08-183-0/+27
| * Check source loctaion in the InhertanceSpecifier testAlex Sinyagin2016-08-181-0/+1
| * Add ast json converter for UsingForDirectiveAlex Sinyagin2016-08-183-1/+31
| * Add a ast json converter for InheritanceSpecifierAlex Sinyagin2016-08-183-0/+27
* | Merge pull request #920 from Denton-L/document-throwingchriseth2016-08-191-2/+5
|\ \ | |/ |/|
| * Document throwing on contract-creation failDenton Liu2016-08-191-1/+2
| * Document throwing on calling empty codeDenton Liu2016-08-181-1/+2
| * Add documentation about throwingDenton Liu2016-08-181-2/+3
* | Merge pull request #918 from winsvega/solremove4chriseth2016-08-177-262/+1
|\ \ | |/ |/|
| * remove solidity --interfaceDimitry2016-08-177-262/+1
* | Merge pull request #839 from chriseth/checkcodechriseth2016-08-173-0/+37
|\ \
| * | Make function calls throw if target does not have code.chriseth2016-08-173-0/+37
| |/
* | Merge pull request #888 from chriseth/throwOnDivZerochriseth2016-08-174-3/+41
|\ \
| * | Fix tests.chriseth2016-08-171-0/+8
| * | Throw on division by zero.chriseth2016-08-173-3/+33
* | | Merge pull request #835 from chriseth/modifierreturnchriseth2016-08-174-44/+212
|\ \ \
| * | | BREAKING: return only exits current function/modifierchriseth2016-08-174-44/+212
| | |/ | |/|
* | | Merge pull request #912 from chriseth/readFromStdinchriseth2016-08-171-11/+17
|\ \ \ | |/ / |/| |
| * | Read from files and stdin.chriseth2016-08-161-11/+17
* | | Merge pull request #836 from chriseth/unusedunderscorechriseth2016-08-174-13/+51
|\ \ \ | |_|/ |/| |
| * | Fix tests.chriseth2016-08-172-12/+12
| * | Require modifiers to contain "_".chriseth2016-08-163-1/+39
* | | Merge pull request #905 from ethereum/chriseth-patch-1chriseth2016-08-171-1/+1
|\ \ \
| * | | Wording: recursive call exploit -> reentrancy exploitchriseth2016-08-161-1/+1
| |/ /
* | | Merge pull request #914 from rainbeam/linux-distro-detectionchriseth2016-08-171-14/+18
|\ \ \
| * | | update commentsrain2016-08-171-9/+2
| * | | don't force upgrade on alpine linux installrain2016-08-171-1/+0
| * | | replace bash with shrain2016-08-171-2/+2
| * | | correct detection string for Alpinerain2016-08-171-1/+1
| * | | fall back to os-release if lsb_release not presentrain2016-08-171-1/+8
| * | | separate function for determining linux distrorain2016-08-171-1/+6
| | |/ | |/|
* | | Merge pull request #838 from chriseth/ecrecoverchriseth2016-08-174-7/+56
|\ \ \
| * | | Actually better to return zero on error.chriseth2016-08-164-9/+5
| * | | Make ecrecover throw for malformed input.chriseth2016-08-162-5/+58
| | |/ | |/|
* | | Fix docs. (#916)chriseth2016-08-171-3/+9
* | | BREAKING: Streamline json output field naming. (#763)chriseth2016-08-171-2/+2
| |/ |/|
* | Introduce hex literals (#832)Alex Beregszaszi2016-08-165-0/+82
* | Reserved keywords update (#833)Alex Beregszaszi2016-08-161-2/+6
* | Provide inline assembly to the code generator. (#840)chriseth2016-08-165-1/+87
* | fix typo in costs modifier (#850)gl3672016-08-161-3/+5
* | Merge pull request #903 from mocamircea/patch-8chriseth2016-08-161-3/+10
|\ \
| * | Update control-structures.rstMircea Moca2016-08-161-3/+8
| * | Update control-structures.rstMircea Moca2016-08-161-1/+3
| |/
* | Merge pull request #710 from chriseth/throwFailedCreatechriseth2016-08-163-0/+67
|\ \
| * | Throw if contract creation fails.chriseth2016-08-163-0/+67
| |/
* | Merge pull request #904 from mocamircea/patch-9chriseth2016-08-161-1/+1
|\ \
| * | Update control-structures.rstMircea Moca2016-08-161-1/+1
| * | Update control-structures.rstMircea Moca2016-08-161-1/+1
| |/
* | Merge pull request #907 from cholewa1992/patch-2chriseth2016-08-161-0/+3
|\ \ | |/ |/|
| * Update index.rstJacob Benjamin Cholewa2016-08-161-0/+3
|/
* Merge pull request #901 from bobsummerwill/test_zipsBob Summerwill2016-08-162-2/+2
|\
| * Confirmed that ZIPs work for Solidity.Bob Summerwill2016-08-162-2/+2
* | Merge pull request #900 from bobsummerwill/test_zipsBob Summerwill2016-08-162-2/+2
|\|
| * Flipped solidity whitelisting to develop, to check ZIP workflow is OK.Bob Summerwill2016-08-162-2/+2
|/
* Merge pull request #899 from Denton-L/disable-commentBob Summerwill2016-08-161-0/+6
|\
| * Disable AppVeyorBot commentsDenton Liu2016-08-161-0/+6
|/
* Merge pull request #896 from bobsummerwill/parameter_for_testsBob Summerwill2016-08-151-7/+6
|\
| * We DO need to run install deps for docs target.Bob Summerwill2016-08-151-1/+0
| * Flipped to !on expressions and added whitespace.Bob Summerwill2016-08-151-6/+6
| * Merge branch 'develop' into parameter_for_testsBob Summerwill2016-08-150-0/+0
| |\ | |/ |/|
* | Merge pull request #895 from bobsummerwill/parameter_for_testsBob Summerwill2016-08-151-25/+61
|\ \
| * | Disabled unit-test runs for Yosemite, El Capitan and Sierra.Bob Summerwill2016-08-151-25/+61
|/ /
| * Disabled unit-test runs for Yosemite, El Capitan and Sierra.Bob Summerwill2016-08-151-25/+61
|/
* Merge pull request #837 from chriseth/testsuitecleanupchriseth2016-08-129-100/+77
|\
| * Move custom test options to after --chriseth2016-08-122-2/+2
| * Show compilation errors in tests.chriseth2016-08-121-1/+12
| * Auto-calibrate mining sleep time.chriseth2016-08-122-9/+30
| * Exponential sleep increase on mining failure.chriseth2016-08-122-3/+7
| * Cleanup of test suite init.chriseth2016-08-124-92/+33
* | Merge pull request #886 from mocamircea/patch-6chriseth2016-08-121-1/+1
|\ \
| * | Update units-and-global-variables.rstMircea Moca2016-08-121-1/+1
* | | Merge pull request #884 from mocamircea/patch-4chriseth2016-08-121-1/+1
|\ \ \ | |/ / |/| |
| * | Update units-and-global-variables.rstMircea Moca2016-08-121-1/+1
|/ /
* | Merge pull request #858 from Denton-L/quotes-docschriseth2016-08-124-12/+24
|\ \
| * | Correct all UTF-8 spellingsDenton Liu2016-08-112-6/+6
| * | Add double-quotes to style guideDenton Liu2016-08-111-1/+13
| * | Change i.e. to e.g.Denton Liu2016-08-111-1/+1
| * | Mention single-quotesDenton Liu2016-08-111-2/+2
| * | Correct UTF-8 spellingsDenton Liu2016-08-111-3/+3
* | | Merge pull request #882 from bobsummerwill/travis_conditionalsBob Summerwill2016-08-122-2/+2
|\ \ \ | |_|/ |/| |
| * | Flip whitelisting to release branch.Bob Summerwill2016-08-122-2/+2
* | | Merge pull request #844 from Denton-L/remove-afterchriseth2016-08-126-17/+6
|\ \ \
| * | | Remove after from grammar.txtDenton Liu2016-08-111-1/+1
| * | | Remove After test caseDenton Liu2016-08-111-6/+0
| * | | Remove after keyword from documentationDenton Liu2016-08-111-2/+1
| * | | Remove After from Types.cppDenton Liu2016-08-111-3/+2
| * | | Revert "Change After to a deprecated token"Denton Liu2016-08-111-5/+1
| * | | Change After to a deprecated tokenDenton Liu2016-08-111-1/+5
| * | | Remove After from ExpressionCompilerDenton Liu2016-08-111-3/+0
| * | | Remove after from Token.hDenton Liu2016-08-111-2/+2
| | |/ | |/|
* | | Merge pull request #880 from bobsummerwill/travis_conditionalsBob Summerwill2016-08-122-5/+1
|\ \ \ | | |/ | |/|
| * | Flipped back to whitelisting develop, and attempting to fix conditional.Bob Summerwill2016-08-122-3/+3
| * | Switched whitelisting to 'release' branch for Appveyor and TravisCI.Bob Summerwill2016-08-122-6/+2
* | | Merge pull request #879 from bobsummerwill/travis_conditionalsBob Summerwill2016-08-121-0/+1
|\| |
| * | Do not run attempt to publish ZIPs for docs or emscripten flows.Bob Summerwill2016-08-121-0/+1
|/ /
* | Merge pull request #856 from asinyagin/developchriseth2016-08-121-0/+3
|\ \
| * | Fix Mapping and InlineAssembly in JSON ASTAlex Sinyagin2016-08-121-0/+2
| * | Fix JSON AST structureAlex Sinyagin2016-08-121-0/+1
* | | Merge pull request #878 from chriseth/newkeychriseth2016-08-122-4/+4
|\ \ \
| * | | Publish releases for develop branch.chriseth2016-08-122-3/+3
| * | | New appveyor key.chriseth2016-08-121-1/+1
|/ / /
* | | Merge pull request #877 from chriseth/newkeychriseth2016-08-121-1/+1
|\ \ \
| * | | New publish key.chriseth2016-08-121-1/+1
|/ / /
* | | Merge pull request #876 from chriseth/fixppachriseth2016-08-121-4/+0
|\ \ \
| * | | Enable publishing again.chriseth2016-08-121-4/+0
* | | | Merge pull request #872 from Denton-L/modify-readmeBob Summerwill2016-08-121-9/+6
|\ \ \ \
| * | | | Update READMEDenton Liu2016-08-121-9/+6
* | | | | Merge pull request #874 from bobsummerwill/enable_zipBob Summerwill2016-08-121-1/+39
|\ \ \ \ \
| * | | | | Added a lot of comments to the TravisCI ZIP release section, for Christian's ...Bob Summerwill2016-08-121-1/+39
* | | | | | Merge pull request #873 from bobsummerwill/enable_zipBob Summerwill2016-08-121-1/+1
|\| | | | |
| * | | | | Flip whitelisting back to 'release' branch.Bob Summerwill2016-08-121-1/+1
* | | | | | Merge pull request #871 from bobsummerwill/enable_zipBob Summerwill2016-08-121-1/+10
|\| | | | | | |/ / / / |/| | | |
| * | | | Added comments about 'auth_token' setup for Appveyor.Bob Summerwill2016-08-121-1/+10
|/ / / /
* | | | Merge pull request #857 from cholewa1992/patch-1chriseth2016-08-121-1/+1
|\ \ \ \
| * | | | Update installing-solidity.rstJacob Benjamin Cholewa2016-08-101-1/+1
* | | | | Merge pull request #870 from chriseth/fixppachriseth2016-08-121-10/+5
|\ \ \ \ \ | | |/ / / | |/| / / | |_|/ / |/| | |
| * | | Debug publishing.chriseth2016-08-121-10/+5
|/ / /
* | | Merge pull request #867 from chriseth/fixppachriseth2016-08-111-0/+10
|\ \ \ | |_|/ |/| |
| * | Debug publishing.chriseth2016-08-111-0/+10
|/ /
* | Merge pull request #862 from chriseth/fixpublishchriseth2016-08-111-16/+16
|\ \
| * | Fix the publishing script to not publish multiple times per day.chriseth2016-08-111-16/+16
|/ /
* | Merge pull request #861 from bobsummerwill/zipsBob Summerwill2016-08-114-52/+48
|\ \
| * | Re-add the ZIP release flow for Solidity.Bob Summerwill2016-08-114-52/+48
|/ /
* | Merge pull request #824 from Denton-L/fix-typochriseth2016-08-111-2/+2
|\ \
| * | Add missing sDenton Liu2016-08-091-1/+1
| * | Refix typoDenton Liu2016-08-091-1/+1
| * | Fix typoDenton Liu2016-08-051-1/+1
* | | Merge pull request #722 from NicolaiSoeborg/developchriseth2016-08-113-29/+83
|\ \ \
| * | | Add syntax for fallback functionsNicolai2016-08-091-1/+1
| * | | Split ElementaryTypeName into smaller rulesNicolai2016-08-021-5/+11
| * | | Remove ambiguity from EventDefinition. Fix SourceUnitNicolai2016-08-021-9/+9
| * | | Remove 'reduce/reduce conflicts' with comma operatorNicolai2016-07-311-1/+1
| * | | Fix reduce/reduce conflicts w/ multiple FunctionCall in ExpressionNicolai2016-07-301-1/+1
| * | | Remove TypeParameterListNicolai2016-07-301-4/+4
| * | | Fixes to expressionNicolai2016-07-271-10/+9
| * | | Added wildcard to UsingForDeclarationNicolai2016-07-271-3/+3
| * | | Imports => ImportDirectiveNicolai2016-07-271-5/+6
| * | | Remove assignment as expr. Add functionCall as primaryExpressionNicolai2016-07-261-6/+6
| * | | Fix missing seperator from commit 8b450dd8Nicolai2016-07-261-1/+1
| * | | Added PlaceholderStatementNicolai2016-07-251-1/+2
| * | | Add StorageLocationNicolai2016-07-251-2/+3
| * | | Allow function to call modifiersNicolai2016-07-251-1/+1
| * | | Order expression according to PR 732Nicolai2016-07-231-9/+18
| * | | New regex for StringLiteralNicolai2016-07-231-1/+2
| * | | Begin fixing expression syntaxNicolai2016-07-231-14/+18
| * | | Added UsingDeclarationNicolai2016-07-211-2/+5
| * | | Extend EventDefinitionNicolai2016-07-211-1/+3
| * | | Fix missing 'ether' from NumberUnit. Extend StringLiteral syntaxNicolai2016-07-201-5/+3
| * | | Added missing (u)fixed typesNicolai2016-07-201-2/+5
| * | | Extend NumberLiteral with unitsNicolai2016-07-201-2/+2
| * | | Added importsNicolai2016-07-201-1/+6
| * | | Add EventDefinitionNicolai2016-07-201-1/+3
| * | | NumberLiteral: Allow 0x prefixNicolai2016-07-201-1/+1
| * | | Allow function returns to be unnamedNicolai2016-07-201-1/+3
| * | | Fix StructDef. Add BoolLiteral. Def NumLiteral, StringLiteral and Identifier.Nicolai2016-07-201-3/+8
| * | | Fix missing quotes in ElementaryTypeNameNicolai2016-07-201-5/+5
| * | | Added ElementaryTypeName, removed explicit recursionNicolai2016-07-201-1/+8
| * | | Add forStmt to Stmt, removes BasicBinaryOperation, throw expr, explicit rec i...Nicolai2016-07-191-7/+6
| * | | Remove "in", extra semicolons, forced function param. Added "throw". Changes ...Nicolai2016-07-191-9/+9
| * | | grammar.txt: Fixes to EnumDef and ArrayTypeNameNicolai2016-07-191-2/+2
| * | | grammer.txt: inheritable => internalNicolai2016-07-191-2/+2
| * | | Grammar: tab => spacesNicolai Søborg2016-07-151-5/+5
| * | | Typos + added missing grammar rulesNicolai2016-07-151-3/+9
| * | | Remove the remains of "expresison"Nicolai2016-07-152-2/+2
* | | | Merge pull request #859 from chriseth/fixppachriseth2016-08-112-4/+7
|\ \ \ \
| * | | | Update release date.chriseth2016-08-111-1/+1
| * | | | Fix ppa script.chriseth2016-08-111-3/+6
* | | | | Merge pull request #848 from bobsummerwill/alpine_linux_install_depsBob Summerwill2016-08-101-6/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Adding Alpine Linux support to release.shBob Summerwill2016-08-091-6/+8
* | | | | Merge pull request #794 from chriseth/fixastsourcechriseth2016-08-102-3/+3
|\ \ \ \ \
| * | | | | Fix segfault in ast output.chriseth2016-08-092-3/+3
* | | | | | Merge pull request #775 from chriseth/versionchriseth2016-08-103-2/+189
|\ \ \ \ \ \
| * | | | | | Version 0.3.6chriseth2016-08-101-1/+1
| * | | | | | Add changelog to source tree.chriseth2016-08-102-1/+188
|/ / / / / /
* | | | | | Merge pull request #823 from chriseth/releaseppachriseth2016-08-101-0/+238
|\ \ \ \ \ \
| * | | | | | Make aware of branches and only create source tarball once.chriseth2016-08-101-11/+38
| * | | | | | Correct jsoncpp versions.chriseth2016-08-101-3/+3
| * | | | | | Do not compile sphinx docs for now, so we get to a workable state.chriseth2016-08-101-5/+4
| * | | | | | PPA release script, still work in progress.chriseth2016-08-101-0/+212
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #826 from axic/utf8-checkchriseth2016-08-104-1/+128
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Remove dev::utf8 namespaceAlex Beregszaszi2016-08-093-11/+1
| * | | | | Use size_t in dev::utf8::validate()Alex Beregszaszi2016-08-093-7/+7
| * | | | | Use consts in dev::utf8::validate()Alex Beregszaszi2016-08-092-7/+7
| * | | | | Use utf8::validate in StringLiteral::toStringAlex Beregszaszi2016-08-091-0/+6
| * | | | | Include UTF8 helpers in libdevcoreAlex Beregszaszi2016-08-092-0/+126
| * | | | | Move LiteralString::toString from the headerAlex Beregszaszi2016-08-092-1/+6
| | |/ / / | |/| | |
* | | | | Merge pull request #855 from chriseth/librarieschriseth2016-08-108-13/+11
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Rename libevmasm.chriseth2016-08-108-12/+10
| * | | | Correctly require jsoncppchriseth2016-08-101-2/+2
|/ / / /
* | | | Merge pull request #828 from axic/identity-gas-fixchriseth2016-08-091-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix identity precompile gas calculationAlex Beregszaszi2016-08-061-2/+2
* | | | Merge pull request #820 from mocamircea/patch-3chriseth2016-08-081-0/+20
|\ \ \ \
| * | | | Update layout-of-source-files.rstMircea Moca2016-08-051-0/+20
| |/ / /
* | | | Merge pull request #819 from mocamircea/patch-2chriseth2016-08-081-1/+1
|\ \ \ \
| * | | | Update layout-of-source-files.rstMircea Moca2016-08-051-1/+1
| |/ / /
* | | | Merge pull request #818 from mocamircea/patch-1chriseth2016-08-081-1/+1
|\ \ \ \
| * | | | Update layout-of-source-files.rstMircea Moca2016-08-051-1/+1
| |/ / /
* | | | Merge pull request #834 from chriseth/devcorecleanupchriseth2016-08-0813-296/+7
|\ \ \ \
| * | | | Correct library usage.chriseth2016-08-085-6/+6
| * | | | Some cleanup regarding libdevcore. Also rename to avoid conflicts.chriseth2016-08-069-292/+3
| |/ / /
* | | | Merge pull request #800 from winsvega/fixbuildchriseth2016-08-081-1/+1
|\ \ \ \
| * | | | fix build on windowsDmitry K2016-08-031-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #829 from bobsummerwill/xcode8Greg Colvin2016-08-071-0/+7
|\ \ \ \
| * | | | Added xcode8 support to TravisCIBob Summerwill2016-08-061-0/+7
|/ / / /
* | | | Merge pull request #822 from chriseth/noheadersBob Summerwill2016-08-064-7/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Do not install headers.chriseth2016-08-054-7/+0
|/ / /
* | | Merge pull request #666 from axic/feature/unicode-escapechriseth2016-08-054-1/+88
|\ \ \
| * | | Document \n, \xNN and \uNNNNAlex Beregszaszi2016-08-051-0/+2
| * | | Fix String Literals documentation about implicit conversionsAlex Beregszaszi2016-08-051-1/+1
| * | | Rename addUnicodeChar to addUnicodeAsUTF8Alex Beregszaszi2016-08-052-3/+3
| * | | Include Unicode tests in the scannerAlex Beregszaszi2016-08-051-0/+40
| * | | Support Unicode escape characters in string literals ('\uUUUU')Alex Beregszaszi2016-08-052-0/+45
* | | | Merge pull request #803 from bobsummerwill/ipc_flagchriseth2016-08-051-10/+2
|\ \ \ \
| * | | | Switch to simpler --ipc parameterization for softest.Bob Summerwill2016-08-051-10/+2
| | |/ / | |/| |
* | | | Merge pull request #816 from ethereum/chriseth-patch-4chriseth2016-08-051-38/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | Build using solidity-standalone.chriseth2016-08-041-38/+10
* | | | Merge pull request #817 from chriseth/workaroundchriseth2016-08-041-0/+520
|\ \ \ \ | |/ / / |/| | |
| * | | Add boost workaround for specific version.chriseth2016-08-041-0/+520
|/ / /
* | | Merge pull request #811 from chriseth/encryptchriseth2016-08-032-1/+1
|\ \ \
| * | | Change deploy key.chriseth2016-08-032-1/+1
|/ / /
* | | Merge pull request #810 from bobsummerwill/developBob Summerwill2016-08-031-0/+1
|\ \ \
| * | | Re-enabled Appveyor cache.Bob Summerwill2016-08-031-0/+1
* | | | Merge pull request #809 from bobsummerwill/developBob Summerwill2016-08-031-6/+6
|\| | |
| * | | OK - Looks like Appveyor softest automation still needs more work before it i...Bob Summerwill2016-08-031-6/+6
* | | | Merge pull request #808 from bobsummerwill/developBob Summerwill2016-08-031-2/+1
|\| | |
| * | | Clear Appveyor cache.Bob Summerwill2016-08-031-2/+1
|/ / /
* | | Merge pull request #807 from bobsummerwill/developBob Summerwill2016-08-031-1/+1
|\ \ \
| * | | Re-enable code builds for Solidity unit-tests within Appveyor.Bob Summerwill2016-08-031-1/+1
* | | | Merge pull request #806 from bobsummerwill/developBob Summerwill2016-08-031-7/+7
|\| | |
| * | | Let's try Windows Tests-over-IPC and see where we are at.Bob Summerwill2016-08-031-7/+7
* | | | Merge pull request #805 from bobsummerwill/developBob Summerwill2016-08-031-1/+1
|\| | |
| * | | Fixed up broken ifdefs in new sockets code.Bob Summerwill2016-08-031-1/+1
|/ / /
* | | Merge pull request #804 from bobsummerwill/fix_build_errorBob Summerwill2016-08-031-1/+1
|\ \ \