Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							269cfbb8ac 
							
						 
					 
					
						
						
							
							Merge branch origin/develop into accounts-integration  
						
						... 
						
						
						
						Conflicts:
	cmd/blocktest/main.go
	cmd/mist/debugger.go
	cmd/utils/cmd.go 
						
					 
					
						2015-03-10 17:14:31 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							9bf513e993 
							
						 
					 
					
						
						
							
							Merge ethereum/poc-9 into accounts-integration  
						
						... 
						
						
						
						Conflicts:
	cmd/utils/cmd.go
	cmd/utils/flags.go
	core/manager.go
	eth/backend.go
	rpc/http/server.go
	xeth/xeth.go 
						
					 
					
						2015-03-09 23:25:46 +01:00 
						 
				 
			
				
					
						
							
							
								Felix Lange 
							
						 
					 
					
						
						
						
						
							
						
						
							2dacb51fb0 
							
						 
					 
					
						
						
							
							cmd/blocktest: simplify to fix build  
						
						... 
						
						
						
						block tests only need the chain, not all of ethereum. 
						
					 
					
						2015-03-09 23:07:24 +01:00 
						 
				 
			
				
					
						
							
							
								Gustav Simonsson 
							
						 
					 
					
						
						
						
						
							
						
						
							27c42ea934 
							
						 
					 
					
						
						
							
							Add empty total difficulty to test blocks and clean up stopping the node  
						
						
						
					 
					
						2015-03-09 18:03:35 +01:00 
						 
				 
			
				
					
						
							
							
								Gustav Simonsson 
							
						 
					 
					
						
						
						
						
							
						
						
							871dfd399b 
							
						 
					 
					
						
						
							
							Add initial implementation of block tests  
						
						... 
						
						
						
						* Add blocktest cmd and support for block tests files in
  tests/BlockTests , the launched node does not connect to
  network, resets state with a genesis block from the test file
  and starts the RPC API 
						
					 
					
						2015-03-04 20:27:09 +01:00