aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixed an issue where the trie might crash on missmatching lengthsobscuren2014-07-152-10/+55
* Merge branch 'develop' of github.com-obscure:ethereum/eth-go into developobscuren2014-07-151-0/+12
|\
| * Add windows helper functionsMaran2014-07-141-0/+12
* | Vm logging on diffobscuren2014-07-154-9/+20
* | Moved checksobscuren2014-07-152-11/+19
* | Paranoia check movedobscuren2014-07-151-17/+0
* | Compare method for receiptsobscuren2014-07-151-0/+12
* | Removed defer and added receipts checking in tx processingobscuren2014-07-151-25/+5
* | Fixed "Copy" to also copy over the pending storage changesobscuren2014-07-141-5/+18
* | Added diff typeobscuren2014-07-141-0/+1
* | Increased block requestobscuren2014-07-141-1/+1
* | Changed diff output not to prefix hex with 0xobscuren2014-07-142-5/+5
|/
* Forgot to return gas when CALL's value transfer failsobscuren2014-07-131-0/+3
* Catch up per 10obscuren2014-07-131-1/+11
* Changed sha3 to official oneobscuren2014-07-122-3/+4
* Special diff output for executionobscuren2014-07-116-8/+57
* vm outputobscuren2014-07-111-0/+2
* Removed serpentobscuren2014-07-111-7/+8
* Updated VM & added helper methods to stateobscuren2014-07-102-70/+101
* Return from execution immediately if there's no codeobscuren2014-07-101-0/+5
* Merge branch 'develop' of github.com-obscure:ethereum/eth-go into developobscuren2014-07-101-0/+10
|\
| * Check current folder for mnemonic words if it fails in source folder. For bin...Maran2014-07-091-0/+10
* | Removed debug logobscuren2014-07-101-3/+0
* | Consensus and bug fixesobscuren2014-07-104-13/+58
* | Removed hardcoded ipobscuren2014-07-101-2/+0
* | Increased timeout to 500msobscuren2014-07-101-1/+1
* | Log received and send toobscuren2014-07-101-2/+2
* | Fixed BYTE opcodeobscuren2014-07-101-6/+25
|/
* Updated peer serverobscuren2014-07-081-1/+1
* Upped protocol version numberobscuren2014-07-071-1/+1
* Fix quitobscuren2014-07-071-1/+1
* Remove debug printlnobscuren2014-07-071-1/+0
* Getting rid of deprecated methodsobscuren2014-07-071-8/+2
* Fixed state reset caseobscuren2014-07-073-4/+29
* Removed old if statement. No longer neededobscuren2014-07-071-7/+1
* Log changeobscuren2014-07-071-2/+1
* Increased timeoutobscuren2014-07-071-1/+1
* Fixed state reset on errobscuren2014-07-071-2/+2
* Merge pull request #34 from ethereum/revert-33-feature/ethutil-refactorJeffrey Wilcke2014-07-0711-353/+159
|\
| * Revert "ethreact - Feature/ethutil refactor"Jeffrey Wilcke2014-07-0711-353/+159
|/
* Merge branch 'develop' of github.com-obscure:ethereum/eth-go into developobscuren2014-07-0711-159/+353
|\
| * Merge pull request #33 from ethersphere/feature/ethutil-refactorJeffrey Wilcke2014-07-0711-159/+353
| |\
| | * fix reactor engine main loop blocked to wait if drainedzelig2014-07-061-8/+14
| | * logger fixzelig2014-07-062-30/+50
| | * Merge branch 'develop' of github.com:ethereum/eth-go into feature/ethutil-ref...zelig2014-07-052-23/+28
| | |\ | | |/ | |/|
| | * Merge branch 'develop' of github.com:ethereum/eth-go into feature/ethutil-ref...zelig2014-07-055-13/+27
| | |\
| | * | ethreactzelig2014-07-053-0/+278
| | * | use ethreact.Event and ethreact.ReactorEnginezelig2014-07-054-12/+19
| | * | remove reactor code from ethutilzelig2014-07-052-117/+0
* | | | changed state resetobscuren2014-07-072-9/+9
* | | | Connect to peer node by defaultobscuren2014-07-071-0/+2
* | | | Protocol bumpobscuren2014-07-071-1/+1
|/ / /
* | | Debugging mode for vmobscuren2014-07-051-17/+14
* | | Fixed crazy loopingobscuren2014-07-051-6/+14
| |/ |/|
* | Debug output, minor fixes and tweaksobscuren2014-07-045-12/+26
* | Length checkobscuren2014-07-041-1/+1
|/
* Fixed shebang check. Previously it would hang on an unknown shebangobscuren2014-07-041-18/+26
* Merge branch 'develop' of github.com-obscure:ethereum/eth-go into developobscuren2014-07-041-1/+0
|\
| * Merge pull request #32 from josephyzhou/developJeffrey Wilcke2014-07-041-1/+0
| |\
| | * typo, duplicationsJoey Zhou2014-07-041-1/+0
* | | Merge branch 'ethersphere-feature/clientid' into developobscuren2014-07-046-38/+122
|\ \ \
| * | | Merge branch 'feature/clientid' of https://github.com/ethersphere/eth-go into...obscuren2014-07-046-38/+122
|/| | |
| * | | ConfigManager (transitional)zelig2014-07-041-27/+19
| * | | peer constructors now set version string with ethereum.ClientIdentity().String()zelig2014-07-041-2/+2
| * | | add ClientIdentity() ethwire.ClientIdentity to Ethereumzelig2014-07-041-9/+16
| * | | ethwire.ClientIdentity now handles Client info sent in handshake + testzelig2014-07-042-0/+84
| * | | Merge branch 'develop' of github.com:ethereum/eth-go into feature/clientidzelig2014-07-036-48/+68
| |\ \ \ | | | |/ | | |/|
| * | | EthManager interface extended with ClientIdentity() ethwire.ClientIdentityzelig2014-07-031-0/+1
* | | | Decreased timeoutobscuren2014-07-042-3/+3
| |_|/ |/| |
* | | Fixed reverting errorobscuren2014-07-034-38/+29
| |/ |/|
* | Fixobscuren2014-07-032-1/+2
* | Fixed CREATE op. Fixes #87obscuren2014-07-031-7/+6
* | Fixed address generationobscuren2014-07-031-5/+3
* | Paranoia checkobscuren2014-07-022-12/+13
* | Removed old codeobscuren2014-07-021-5/+1
* | Added paranoia checkobscuren2014-07-021-0/+14
* | Changed CREATEobscuren2014-07-021-24/+35
|/
* Moved methodsobscuren2014-07-021-46/+47
* Added support for breakpoints on specific instructionsobscuren2014-07-021-3/+13
* Removed commentobscuren2014-07-021-1/+0
* Moved debug hook to Vm directlyobscuren2014-07-023-9/+11
* Suicide is deferred to updateobscuren2014-07-022-8/+12
* Updated to generic padding functionobscuren2014-07-021-4/+3
* l <=> robscuren2014-07-021-3/+2
* Removed old methodobscuren2014-07-025-46/+39
* Added quitting reasonobscuren2014-07-021-8/+10
* Removed old codeobscuren2014-07-021-12/+0
* delete?obscuren2014-07-0251-13288/+0
* Added utility wrapper for Ethereum Config contractobscuren2014-07-021-7/+44
* Added Left and Right padding utility functionsobscuren2014-07-021-1/+24
* Fixed key import for empty entriesobscuren2014-07-021-1/+5
* Added Path utilityobscuren2014-07-021-0/+20
* bumpobscuren2014-07-012-2/+2
* Merge pull request #28 from ethersphere/feature/keysJeffrey Wilcke2014-07-0135-1994/+2440
|\
| * ethutil -> ethtrie.NewTriezelig2014-07-012-2/+3
| * merge upstreamzelig2014-07-0171-136/+13642
| |\ | |/ |/|
* | Merge branch 'develop' of github.com-obscure:ethereum/eth-go into developobscuren2014-07-012-1/+2
|\ \
| * \ Merge branch 'develop' of github.com:ethereum/eth-go into developMaran2014-07-0155-2/+13350
| |\ \
| * | | Update min GasLimitMaran2014-07-012-1/+2
* | | | Upobscuren2014-07-012-2/+2
| |/ / |/| |
* | | Merge branch 'ethersphere-feature/keys' into developobscuren2014-07-0154-1/+13349
|\ \ \
| * | | Merge branch 'feature/keys' of https://github.com/ethersphere/go-ethereum int...obscuren2014-07-0154-1/+13349
|/| | |
| * | | changed name for ethutil hex functions; and access to keyring via keyManagerzelig2014-06-305-8/+8
| * | | gui changeszelig2014-06-301-36/+52
| * | | remove ui/library; instead expose gui itself for initial windowzelig2014-06-301-46/+0
| * | | main loop uses new flags and common methods in util: db, keymanager set up; p...zelig2014-06-301-3/+7
| * | | new command line optionszelig2014-06-301-4/+8
| * | | Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/keyszelig2014-06-302-0/+4
| |\ \ \
| | * \ \ Merge branch 'master' into developobscuren2014-06-292-0/+4
| | |\ \ \
| | | * | | Wait for catchup when starting the minerobscuren2014-06-291-0/+4
| | | * | | Merge branch 'develop'obscuren2014-06-272-5/+11
| | | |\ \ \
| | | * | | | Added install scriptobscuren2014-06-271-0/+48
| | | * | | | Merge branch 'release/0.5.15'obscuren2014-06-2726-593/+797
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'release/0.5.14'obscuren2014-06-205-57/+7
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'release/0.5.13'obscuren2014-06-179-35/+141
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'release/poc5-rc12'obscuren2014-06-109-22/+192
| | | |\ \ \ \ \ \ \
| * | | | | | | | | | added utility functions to set up db, keymanager, ethereum init and simplify ...zelig2014-06-301-46/+50
| * | | | | | | | | | remove keys file, now subsumed under ethcrypto/key_managerzelig2014-06-301-108/+0
| * | | | | | | | | | main loop uses new flags and common methods in util: db, keymanager set upzelig2014-06-301-2/+6
| * | | | | | | | | | new command line optionszelig2014-06-301-4/+8
| * | | | | | | | | | changed name for ethutil hex functionszelig2014-06-301-5/+5
| * | | | | | | | | | fix logmessage if data directory doesn't existzelig2014-06-291-1/+1
| |/ / / / / / / / /
| * | | | | | | | | Check if go install succeedobscuren2014-06-271-0/+4
| * | | | | | | | | Fix for installerobscuren2014-06-272-2/+2
| | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Initialization of Qt should happen before anything elseobscuren2014-06-271-2/+3
| * | | | | | | | updateobscuren2014-06-271-1/+5
| * | | | | | | | updateobscuren2014-06-271-1/+1
| * | | | | | | | Added install scriptobscuren2014-06-271-0/+49
| * | | | | | | | Merge branch 'release/0.5.15' into developobscuren2014-06-272-2/+2
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | bumpobscuren2014-06-271-1/+1
| | * | | | | | | Merge branch 'develop' into release/0.5.15obscuren2014-06-2717-506/+551
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'ethersphere-feature/logging' into developobscuren2014-06-2717-506/+551
| |\ \ \ \ \ \ \ \
| | * | | | | | | | go fmtzelig2014-06-278-226/+226
| | * | | | | | | | Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/loggingzelig2014-06-263-23/+33
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | gui stopzelig2014-06-264-13/+47
| | * | | | | | | | | log sliderzelig2014-06-262-3/+15
| | * | | | | | | | | interrupt handlers now orderedzelig2014-06-264-16/+24
| | * | | | | | | | | new logger API for upstream mergezelig2014-06-261-1/+1
| | * | | | | | | | | repl.Stop() to only if running, fixes panic after js> exit followed by interruptzelig2014-06-261-15/+23
| | * | | | | | | | | add newline to help usage msgzelig2014-06-262-2/+2
| | * | | | | | | | | Merge remote-tracking branch 'upstream/develop' into feature/loggingzelig2014-06-251-41/+0
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | update log levels to include DebugDetail; correct default datadir for etherealzelig2014-06-252-3/+4
| | * | | | | | | | | | fix logSlider: now has 5 levels, initialized to gui.GetLogLevel which is set ...zelig2014-06-251-2/+2
| | * | | | | | | | | | merge upstreamzelig2014-06-2511-39/+210
| | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | fix imports in ui_lib and flags cos of defaultAssetPath move; fix logLevel ty...zelig2014-06-234-11/+17
| | * | | | | | | | | | | merge upstreamzelig2014-06-232-4/+17
| | |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | refactor cli and gui wrapper code. Details:zelig2014-06-2310-465/+429
| | * | | | | | | | | | | | fix gitignore to ignore executableszelig2014-06-231-1/+2
| | * | | | | | | | | | | | merge upstreamzelig2014-06-235-57/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | changed logger API, functions that allow Gui to implement ethlog.LogSystem fo...zelig2014-06-233-29/+38
| | * | | | | | | | | | | | | add logging for jsrezelig2014-06-231-1/+7
| | * | | | | | | | | | | | | add logging start/exit to js consolezelig2014-06-231-0/+2
| | * | | | | | | | | | | | | Merge branch 'develop' of github.com:ethereum/go-ethereum into developzelig2014-06-196-28/+101
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:ethereum/go-ethereum into developzelig2014-06-1419-595/+1392
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:ethereum/go-ethereum into developzelig2014-05-2410-22/+97
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | * | | | | | | bumpobscuren2014-06-271-1/+1
| | |_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Increase width of asm instructionobscuren2014-06-271-1/+1
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Added amount to contract during debuggingobscuren2014-06-262-8/+12
| * | | | | | | | | | | | | | | Added option to not break eachlineobscuren2014-06-263-15/+21
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Removed old compile methodsobscuren2014-06-251-41/+0
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Implemented TX History for ethjsMaran2014-06-252-0/+9
| * | | | | | | | | | | | | Moved BlockDo to utilsobscuren2014-06-252-1/+20
| * | | | | | | | | | | | | Save repl history to file and recall on next sessionobscuren2014-06-242-2/+29
| * | | | | | | | | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-06-245-35/+152
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:ethereum/go-ethereum into developMaran2014-06-232-3/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Implements QML Apps. Implements #47Maran2014-06-235-35/+152
| | | |_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Renamed execBlockobscuren2014-06-241-1/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Added a execBlock method which replays the given blockobscuren2014-06-232-3/+21
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'release/0.5.14' into developobscuren2014-06-202-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | bumpobscuren2014-06-202-2/+2
| |/ / / / / / / / / /
| * | | | | | | | | | Removed old debugger codeobscuren2014-06-202-52/+2
| * | | | | | | | | | Verbose loggingobscuren2014-06-192-3/+3
| | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'release/0.5.13' into developobscuren2014-06-172-2/+2
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | bumpobscuren2014-06-172-2/+2
| |/ / / / / / / /
| * | | | | | | | Removed init feesobscuren2014-06-162-6/+0
| * | | | | | | | Max 250 logobscuren2014-06-151-1/+7
| * | | | | | | | Added a log level slider which can change the log levelobscuren2014-06-143-9/+53
| * | | | | | | | Minor UI adjustmentsobscuren2014-06-122-11/+40
| | |_|/ / / / / | |/| | | | | |
| * | | | | | | Toggle inspector / reload using magic rectangleMaran2014-06-111-1/+25
| * | | | | | | Reimplement -datadir flag. Implements #79Maran2014-06-114-4/+12
| * | | | | | | Implemented usedGas to the explorerMaran2014-06-111-3/+3
| * | | | | | | Add GasLimit to the block explorerMaran2014-06-111-2/+3
| * | | | | | | Merge branch 'release/poc5-rc12' into developobscuren2014-06-102-2/+2
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | bumpobscuren2014-06-102-2/+2
| |/ / / / / /
| * | | | | | Fixed debugger hangobscuren2014-06-103-9/+33
| * | | | | | debugger outputobscuren2014-06-061-1/+2
| * | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-06-056-7/+143
| |\ \ \ \ \ \
| | * | | | | | Implement getStateKeyVal for JS bindings.Maran2014-06-044-3/+18
| | * | | | | | Add loading of extra build in js files to JS-Repl. Implements #67Maran2014-06-041-0/+19
| | * | | | | | Added namereg register option to qml walletMaran2014-06-032-2/+30
| | * | | | | | Implemented transaction catching up. Implements #73Maran2014-06-031-0/+11
| | * | | | | | Tweaks and latency added to peeroverviewMaran2014-06-031-5/+6
| | * | | | | | Added Peer WindowMaran2014-06-023-2/+64
| | | |_|/ / / | | |/| | | |
| * / | | | | Added more debugger outputobscuren2014-06-051-4/+13
| |/ / / / /
| * | | | | ethereum instead of ethereal. Fixes #69obscuren2014-05-311-1/+1
| * | | | | fixed logging issue that would otherwise crash the client. Fixes #68obscuren2014-05-311-6/+9
| * | | | | Merge branch 'develop'obscuren2014-05-311-1/+2
| |\ \ \ \ \
| | * | | | | show first?obscuren2014-05-311-1/+2
| * | | | | | Merge branch 'develop'obscuren2014-05-314-17/+43
| |\| | | | |
| | * | | | | Added ini file for ethereum. fixes #66obscuren2014-05-314-17/+43
| * | | | | | Merge branch 'develop'obscuren2014-05-3010-1042/+1001
| |\| | | | |
| | * | | | | Added config file setup. Fixes #59obscuren2014-05-305-28/+35
| | * | | | | Unified the contract interface and tx interface. Fixes #62obscuren2014-05-302-51/+54
| | * | | | | Improved UIobscuren2014-05-305-130/+47
| | * | | | | Update peer infoobscuren2014-05-301-3/+13
| | * | | | | Minor GUI updatesobscuren2014-05-303-36/+49
| | * | | | | .obscuren2014-05-291-1001/+1001
| | * | | | | Minor UI changesobscuren2014-05-294-17/+25
| | * | | | | Minimal fee for sending transactionsobscuren2014-05-291-1/+1
| | * | | | | Removed regexp for nameregobscuren2014-05-291-2/+2
| | * | | | | Disabled instruction selectionobscuren2014-05-292-2/+3
| * | | | | | Merge branch 'develop'obscuren2014-05-296-243/+252
| |\| | | | |
| | * | | | | mergeobscuren2014-05-294-1007/+1004
| | |\ \ \ \ \
| | | * | | | | Add 0x when feeding data to debuggerMaran2014-05-291-1/+1
| | | * | | | | Merge branch 'release/poc5-rc11' into developMaran2014-05-282-2/+2
| | | |\ \ \ \ \
| | * | | | | | | Fixes and improved debuggerobscuren2014-05-295-1242/+1252
| * | | | | | | | Fix merge conflictMaran2014-05-280-0/+0
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Data and script in the debugger accept "0x" values and regular scriptingobscuren2014-05-282-25/+45
| * | | | | | | | | Merge branch 'release/poc5-rc11'Maran2014-05-286-37/+106
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Bump to RC11Maran2014-05-282-2/+2
| | | |/ / / / / | | |/| | | | |
| | * | | | | | Refactor hex encode and remove coupling of popup to main windowMaran2014-05-282-4/+2
| | |/ / / / /
| | * | | | | Hooked up the Block Explorer to the Debugger so we can instantly debug made t...Maran2014-05-283-8/+59
| | * | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-05-280-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'hotfix/2' into developMaran2014-05-283-990/+976
| | | |\ \ \ \ \
| | * | \ \ \ \ \ Merge branch 'master' into developobscuren2014-05-283-990/+976
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'hotfix/2'Maran2014-05-283-990/+976
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Consolidated external qml files to hopefully prevent crashing bugMaran2014-05-283-990/+976
| |/ / / / / / /
| * | | | | | | Merge branch 'develop'obscuren2014-05-272-1/+32
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge branch 'release/poc5-rc10'obscuren2014-05-279-112/+617
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'release/poc5-rc9'obscuren2014-05-2612-33/+113
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'release/poc5-rc8'obscuren2014-05-218-46/+156
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'release/poc5-rc7'obscuren2014-05-2017-304/+522
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'release/poc5-rc6'obscuren2014-05-1513-120/+195
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'develop'obscuren2014-05-131-2/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release/poc5-rc4'obscuren2014-05-1311-185/+355
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release/poc5-rc3'obscuren2014-05-104-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release/poc5-rc2'obscuren2014-05-1014-298/+590
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'release/poc5-rc1'obscuren2014-05-0534-247/+10205
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | * | | | Debugger script&data now accept "0x" valuesobscuren2014-05-282-25/+45
| | | | | | | | | | | | |/ / / /
| | | | | | | | | | | | * | | | Added some shortcutsobscuren2014-05-272-1/+32
| | | | | | | | | | | | * | | | Merge branch 'release/poc5-rc10' into developobscuren2014-05-272-2/+2
| | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | |/ / / / | | | | | | | | | | | |/| | | |
| | | | | | | | | | | * | | | | bumpobscuren2014-05-272-2/+2
| | | | | | | | | | | |/ / / /
| | | | | | | | | | | * | | | Minor fixes and improvements to the uiobscuren2014-05-274-27/+40
| | | | | | | | | | | * | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-05-273-22/+161
| | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | * | | | Uhm whatMaran2014-05-271-1/+2
| | | | | | | | | | | | * | | | Adding new blocks on broadcastMaran2014-05-272-5/+15
| | | | | | | | | | | | * | | | Increase size for asmMaran2014-05-271-2/+2
| | | | | | | | | | | | * | | | Removed recursive function for loopMaran2014-05-272-15/+8
| | | | | | | | | | | | * | | | Fix merge conflictMaran2014-05-274-47/+64
| | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | * | | | | Remove extra log statementMaran2014-05-261-1/+0