aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * Bump to RC11Maran2014-05-282-2/+2
| |/
| * Refactor hex encode and remove coupling of popup to main windowMaran2014-05-282-4/+2
* | Fixes and improved debuggerobscuren2014-05-295-1242/+1252
|/
* 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'2Maran2014-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'poc5-rc10obscuren2014-05-279-112/+617
| |\ \
| * \ \ Merge branch 'release/poc5-rc9'poc5-rc9obscuren2014-05-2612-33/+113
| |\ \ \
| * \ \ \ Merge branch 'release/poc5-rc8'poc5-rc8obscuren2014-05-218-46/+156
| |\ \ \ \
| * \ \ \ \ Merge branch 'release/poc5-rc7'poc5-rc7obscuren2014-05-2017-304/+522
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'release/poc5-rc6'poc5-rc6obscuren2014-05-1513-120/+195
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop'obscuren2014-05-131-2/+2
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'release/poc5-rc4'poc5-rc4obscuren2014-05-1311-185/+355
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'release/poc5-rc3'poc5-rc3obscuren2014-05-104-5/+5
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'release/poc5-rc2'poc5-rc2obscuren2014-05-1014-298/+590
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'release/poc5-rc1'poc5-rc1obscuren2014-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
| * | | | | | | | | | | | Implemented simple block/tx explorerMaran2014-05-262-20/+139
| * | | | | | | | | | | | Merge branch 'develop' of github.com:ethereum/go-ethereum into developMaran2014-05-267-21/+33
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:ethereum/go-ethereum into developMaran2014-05-234-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Hide inspector by defaultMaran2014-05-221-1/+1
| * | | | | | | | | | | | | | Fix merge conflictsMaran2014-05-225-3/+73
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:ethereum/go-ethereum into developMaran2014-05-213-10/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' of github.com:ethereum/go-ethereum into developMaran2014-05-212-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Wait with mining until up to dateMaran2014-05-211-5/+4
* | | | | | | | | | | | | | | | | | New debugger implementedobscuren2014-05-274-18/+25
* | | | | | | | | | | | | | | | | | New debuggerobscuren2014-05-273-145/+258
* | | | | | | | | | | | | | | | | | Sep debugger from mainobscuren2014-05-274-6/+222
| |_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Fixed debuggerobscuren2014-05-274-47/+64
| |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'release/poc5-rc9' into developobscuren2014-05-262-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Bumpobscuren2014-05-262-2/+2
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Recv send for txsobscuren2014-05-262-10/+15
* | | | | | | | | | | | | | | New main script through init return valueobscuren2014-05-235-10/+17
| |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Custom identifierobscuren2014-05-224-3/+10
| |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Added mining stop and startobscuren2014-05-222-9/+44
* | | | | | | | | | | | | Fixes #49obscuren2014-05-221-0/+5
* | | | | | | | | | | | | Fixes #50obscuren2014-05-221-1/+22
| |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'release/poc5-rc8' into developobscuren2014-05-212-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Bumpedobscuren2014-05-212-3/+4
|/ / / / / / / / / / /
* | | | | | | | | | | Improved on some ui elementsobscuren2014-05-212-0/+40
* | | | | | | | | | | Fixed unconfirmed balance stringobscuren2014-05-211-7/+2
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Removed method nameobscuren2014-05-212-1/+5
|/ / / / / / / / /
* | | | | | | | | Updated readme to reflect optionsobscuren2014-05-212-17/+13
* | | | | | | | | Switch variables as intendedobscuren2014-05-211-2/+2
* | | | | | | | | Changed flag parsingobscuren2014-05-211-1/+10
* | | | | | | | | Refactored some of the functionsobscuren2014-05-212-16/+81
* | | | | | | | | Forked version of otto so we can support lowerCased methodsobscuren2014-05-203-3/+3
* | | | | | | | | Merge branch 'release/poc5-rc7' into developobscuren2014-05-202-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Bumpobscuren2014-05-202-2/+2
|/ / / / / / / /
* | | | | | | | Implemented GUI watchers for rapid reload. Implements #46Maran2014-05-202-3/+69
* | | | | | | | Removed old console in favor of the new JS REPLobscuren2014-05-203-272/+1
* | | | | | | | Refactored file structureobscuren2014-05-203-101/+124
* | | | | | | | Increase default peer amount to 10Maran2014-05-202-2/+2
* | | | | | | | Added js interpret modeobscuren2014-05-193-3/+29
* | | | | | | | Improved REPL outputobscuren2014-05-195-12/+89
* | | | | | | | Added multi-line supportobscuren2014-05-193-9/+35
* | | | | | | | Improved consoleobscuren2014-05-191-4/+70
* | | | | | | | Changed loggingobscuren2014-05-191-4/+3
* | | | | | | | Removed nonce incrementingobscuren2014-05-191-2/+4
* | | | | | | | Readline repl for linux & osxobscuren2014-05-177-39/+122
* | | | | | | | Merge branch 'feature/otto' into developobscuren2014-05-164-2/+122
|\ \ \ \ \ \ \ \
| * | | | | | | | Tell config which loggers to useobscuren2014-05-162-3/+3
| * | | | | | | | Implemented JavaScript consoleobscuren2014-05-162-18/+53
| * | | | | | | | Basic javascript consoleobscuren2014-05-163-0/+85
|/ / / / / / / /
* | | | | | | | Refactored to reactor. Fixes #42obscuren2014-05-151-6/+7
* | | | | | | | Merge branch 'release/poc5-rc6' into developobscuren2014-05-152-2/+4
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Bumped versionobscuren2014-05-152-2/+4
|/ / / / / / /
* | | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-05-143-22/+28
|\ \ \ \ \ \ \
| * | | | | | | Prevent crash during import of privkeys.Maran2014-05-141-3/+2
| * | | | | | | Fix merge conflictsMaran2014-05-1411-72/+107
| |\ \ \ \ \ \ \
| * | | | | | | | Make sure we have a coinbase address to mine withMaran2014-05-141-4/+10
| * | | | | | | | Refactored RPC client to utils so it can be reusedMaran2014-05-143-17/+14
| * | | | | | | | Rewritten a check to only start mining once we are caught up with all peersMaran2014-05-141-6/+9
* | | | | | | | | Update wallet value for coinbase rewards. Implements #44 & #43obscuren2014-05-142-12/+31
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Switched to new keyring methodsobscuren2014-05-1411-71/+106
|/ / / / / / /
* | | | | | | Refactored mining into utils and exposed it to ethereal. Partly fixes #43Maran2014-05-143-24/+36
* | | | | | | Generate coinbase from privatekey, not pubkey. Partily fixes #43Maran2014-05-141-1/+1
* | | | | | | Changed validators to regexp validatorsobscuren2014-05-142-4/+5
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-05-131-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | TypoMaran2014-05-131-1/+1
| * | | | | Removed harcoded addresses from GetBlock JS bindings. Fixes #39Maran2014-05-131-2/+2
* | | | | | Bumpedobscuren2014-05-131-1/+1
|/ / / / /
* | | | | Depcrecated setMaran2014-05-131-0/+3
* | | | | Adding new API test case htmlMaran2014-05-131-0/+43
* | | | | Change coinbase to be the address not public keyMaran2014-05-131-1/+4
* | | | | Implemented new JS/EthPub methodsMaran2014-05-133-22/+66
* | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-05-135-4/+8
|\ \ \ \ \
| * \ \ \ \ Fix merge conflictMaran2014-05-133-4/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' of github.com:ethereum/go-ethereum into developMaran2014-05-131-3/+3
| |\ \ \ \ \ \
| * | | | | | | Implemented a flag for a different RPC port; --rpcportMaran2014-05-134-2/+6
* | | | | | | | Fixobscuren2014-05-132-2/+2
| |_|/ / / / / |/| | | | | |
* | | | | | | Public ethereum interface uses EthManagerobscuren2014-05-133-3/+3
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-05-134-6/+14
|\| | | | |
| * | | | | Added support to NewJsonRpc to return an error as well as an interfaceMaran2014-05-132-4/+12
| * | | | | Enable seed againMaran2014-05-132-2/+2
* | | | | | Fixed wallet crash for new account. Fixes #38obscuren2014-05-131-3/+3
|/ / / / /
* | | | | Merge branch 'develop' of github.com:ethereum/go-ethereum into developMaran2014-05-122-155/+214
|\ \ \ \ \
| * \ \ \ \ Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-05-122-2/+2
| |\ \ \ \ \
| * | | | | | Refactored some code and fixed #37obscuren2014-05-122-155/+214
* | | | | | | Actually start the Ethereum server on starting the GUIMaran2014-05-121-0/+6
| |/ / / / / |/| | | | |
* | | | | | Disable seed by defaultMaran2014-05-122-2/+2
|/ / / / /
* | | | | PreProcess => PreParseobscuren2014-05-121-1/+1
* | | | | Merge branch 'release/poc5-rc3' into developobscuren2014-05-104-5/+5
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Upgraded to new mutanobscuren2014-05-104-5/+5
|/ / / /
* | | | Merge branch 'release/poc5-rc2' into developobscuren2014-05-101-1/+1
|\ \ \ \ | | |_|/ | |/| |
| * | | Bumpobscuren2014-05-101-1/+1
|/ / /
* | | fxedobscuren2014-05-105-4/+619
* | | Moved Ext app js to its own dirobscuren2014-05-106-252/+12
* | | Changed seedingobscuren2014-05-093-4/+3
* | | Cleanupobscuren2014-05-095-157/+77
* | | Fixed closureobscuren2014-05-082-4/+3
* | | Normalized fontobscuren2014-05-061-1/+0
* | | Merge branch 'release/poc5-rc1' into developobscuren2014-05-051-1/+2
|\ \ \ | | |/ | |/|
| * | bumpobscuren2014-05-051-1/+2
|/ /
* | Renamed etherpc to ethrpcMaran2014-05-052-4/+4
* | Merge branch 'develop' into feature/rpcMaran2014-05-055-24/+58
|\ \
| * | Changed getkey and secrettoaddressobscuren2014-05-053-16/+20
| * | Added storage watchobscuren2014-05-055-18/+48
* | | Implemented rpc for ethereal and ethereumMaran2014-05-053-5/+10
* | | Fix circular depsMaran2014-05-031-2/+5
* | | Merge branch 'develop' into feature/rpcMaran2014-05-027-221/+21
|\| |
| * | Updated sample coinobscuren2014-05-021-2/+2
| * | Moved public interfaceobscuren2014-05-026-219/+19
* | | Merge branch 'develop' into feature/rpcMaran2014-05-0216-253/+352
|\| |
| * | Fixed samplecoinobscuren2014-05-025-29/+42
| * | Added string conversion APIobscuren2014-05-023-2/+61
| * | Moved APIobscuren2014-05-024-107/+17
| * | Moved Ext ethereum apiobscuren2014-05-022-17/+124
| * | Added a 'set' method to change window settings for external applicationsobscuren2014-05-023-0/+12
| * | Moved and improved sample coinobscuren2014-05-025-0/+114
| * | Fixed minor issue with upnp where 'err' wasn't checked resulting in crashobscuren2014-05-024-125/+9
* | | Moved RPC Server and implemented it as a packageMaran2014-05-025-267/+9
* | | Initial commitMaran2014-05-022-0/+267
|/ /
* | Fixed tx nonceobscuren2014-04-301-2/+5
* | getBalanceAt getStorageAt, fixed get balance api callobscuren2014-04-303-5/+9
* | fixed state object changes for eth apiobscuren2014-04-306-58/+98
* | API changesobscuren2014-04-303-152/+208
* | Split off External applications from main libraryobscuren2014-04-304-57/+286
* | Added mutedobscuren2014-04-297-173/+287
* | Merge pull request #34 from compleatang/developJeffrey Wilcke2014-04-292-3/+3
|\ \
| * | PreProcess moved to Mutan packageCasey Kuhlman2014-04-282-3/+3
|/ /
* | Draft mut(an)ed(itor)obscuren2014-04-2810-0/+8300
* | Using mutan assembler stageobscuren2014-04-281-2/+2
* | Updated version numberobscuren2014-04-272-2/+2
* | Leverage the new watch & address:changed functionalityobscuren2014-04-268-68/+114
* | Movedobscuren2014-04-261-0/+65
* | Mergeobscuren2014-04-253-69/+67
|\ \
| * | typo interruptzelig2014-04-161-2/+2
| * | non-interactive optionzelig2014-04-162-57/+49
| * | logfilezelig2014-04-162-7/+23
| * | empty string -> empty byte arrayzelig2014-04-161-1/+1
* | | Added callback mechanism and updated UIobscuren2014-04-245-19/+64
* | | Added new block sub for webappobscuren2014-04-241-0/+26
* | | Minor fixes and sample coin "improvements"obscuren2014-04-248-23/+108
* | | Refactored codeobscuren2014-04-232-13/+28
* | | Minor update and fixes to the gui and consoleobscuren2014-04-236-11/+23
* | | Updated test coinobscuren2014-04-233-84/+139
* | | Round one HTML external applications using QML(Qt5) WebKit2 w/o native bindingsobscuren2014-04-213-0/+160
* | | Round one HTML external applications using QML(Qt5) WebKit2 w/o native bindingsobscuren2014-04-212-1/+22
* | | Updated closure callobscuren2014-04-201-2/+1
* | | Moved compiling related object to utils packageobscuren2014-04-161-0/+24
* | | Updated to use new state objectobscuren2014-04-164-39/+24
* | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-04-163-24/+74
|\| |
| * | Fix up panelingMaran2014-04-151-31/+30
| * | Adding log messages to debug panelMaran2014-04-152-0/+18
| * | Merge branch 'develop' of github.com:ethereum/go-ethereum into developMaran2014-04-154-66/+113
| |\ \
| * | | Add send to contractMaran2014-04-152-4/+37
* | | | added init and main functions to scriptobscuren2014-04-161-11/+27
| |/ / |/| |
* | | Mergeobscuren2014-04-124-278/+311
|\| |
| * | Added isContract to guiMaran2014-04-122-2/+11
| * | remove test menuMaran2014-04-121-29/+0
| * | Initial refactor for wallet qmlMaran2014-04-123-258/+280
| * | Refactored simple send to use statesMaran2014-04-121-180/+211
* | | Debug stepsobscuren2014-04-124-45/+68
* | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-04-125-62/+455
|\| |
| * | Fix merge conflictsMaran2014-04-124-35/+150
| |\ \
| * | | Improved (hopefully) the send transaction tabMaran2014-04-122-57/+226
| * | | Implemented key importing/generation for the GUIMaran2014-04-115-11/+237
* | | | Debuggerobscuren2014-04-121-16/+40
| |/ / |/| |
* | | Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-04-123-25/+31
|\| |
| * | Merge branch 'feature/mnemonic' into developMaran2014-04-092-3/+15
| |\ \
| | * | Importing mnemonic supportMaran2014-04-091-1/+12
| | * | Merge branch 'develop' into feature/mnemonicMaran2014-04-094-37/+37
| | |\ \
| | * | | Added mnemonic priv keyMaran2014-04-071-2/+3
| * | | | Merge pull request #32 from cabreraalex/developJeffrey Wilcke2014-04-091-22/+16
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fixed up grammar and spelling in READMEAlex Cabrera2014-04-081-22/+16
| | |/ /
* | / / Added wip debuggerobscuren2014-04-124-49/+166
|/ / /
* | | Nonce handlingobscuren2014-04-091-1/+3
* | | Merge branch 'develop' into minerobscuren2014-04-052-6/+19
|\ \ \
| * | | Added tx outputobscuren2014-04-012-6/+19
| |/ /
* | | Fix merge conflictMaran2014-04-019-39/+115
|\| |
| * | Fixed minerobscuren2014-03-311-3/+3
| * | Fixed an issue with sending gas to a contractobscuren2014-03-312-3/+3
| * | Updated to new mutan apiobscuren2014-03-313-8/+8
| * | Removed CreateTxobscuren2014-03-281-3/+3
| * | Added gas and gas price.obscuren2014-03-283-8/+75
| * | Merge branch 'master' into developobscuren2014-03-274-9/+22
| |\|
| | * Merge pull request #31 from ethersphere/masterJeffrey Wilcke2014-03-274-9/+22
| | |\
| | | * assetPath configurable on command line for ethereal GUIzelig2014-03-274-9/+22
| | |/
| * / Updated transaction constructorobscuren2014-03-272-15/+11
| |/
* | Reimplement new miner creationMaran2014-03-241-29/+15
* | Merge master into miner branchMaran2014-03-2423-211/+269
|\|
| * Moved node to ethereumobscuren2014-03-223-0/+448
| * Moved node to ethereumobscuren2014-03-224-448/+0
| * Merge branch 'develop' of https://github.com/WeMeetAgain/go-ethereum into WeM...obscuren2014-03-221-8/+9
| |\
| | * working linux makefileCayman Nava2014-03-161-6/+11
| * | Major re-organisation.obscuren2014-03-2223-323/+357
| * | .obscuren2014-03-221-1/+1
| * | Updated to work with the new chainobscuren2014-03-214-7/+12
* | | Mining reworkMaran2014-03-202-89/+9
* | | Merge conflictsMaran2014-03-171-12/+20
|\| |
| * | Fixed asset path error. Fixes #29obscuren2014-03-171-12/+21
| |/
* | More mining stuffMaran2014-03-112-5/+12
* | Initial smart-miner stuffMaran2014-03-102-19/+74
|/
* Renamed block manager to state managerobscuren2014-03-052-3/+3
* Conform to the new server modelobscuren2014-03-051-4/+4
* Moved qml files, conform to the new server model.obscuren2014-03-055-27/+27
* Block mining logobscuren2014-03-031-0/+1
* Using asset path helper (includes a debug path atm)obscuren2014-03-033-87/+147
* WIP Makefileobscuren2014-03-031-0/+20
* Get rid of the xpm filesobscuren2014-03-032-0/+0
* Updated to use the state on the blocksobscuren2014-03-031-1/+1
* Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into developobscuren2014-03-021-2/+1
|\
| * Update README.mdJeffrey Wilcke2014-03-011-2/+1
* | Update README.mdJeffrey Wilcke2014-03-011-1/+1
* | Update README.mdJeffrey Wilcke2014-03-011-2/+1
|/
* Merge pull request #21 from jarradh/master0.3.1Jeffrey Wilcke2014-02-281-2/+8
|\
| * Search bin directory for qmlJarrad Hope2014-02-281-2/+8
|/
* Merge branch 'develop'obscuren2014-02-282-4/+17
|\
| * fixed about windowobscuren2014-02-282-4/+17
| * Merge branch 'release/0.3.0' into developobscuren2014-02-2811-138/+154
| |\
* | \ Merge branch 'release/0.3.0'0.3.0obscuren2014-02-2817-85/+882
|\ \ \ | | |/ | |/|