| 
							
							
								 Tomusdrw | 1414fe28b9 | Merge branch 'master' into evm | 2016-01-17 11:41:46 +01:00 |  | 
			
				
					| 
							
							
								 Tomusdrw | 94f23ac5ba | Merge branch 'gav' into evm+gav Conflicts:
	src/ethereum/ethash.rs | 2016-01-17 01:18:35 +01:00 |  | 
			
				
					| 
							
							
								 Tomusdrw | 56c059588d | Changing state tests to support transition | 2016-01-16 21:08:04 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 86a6fa95a6 | Minor fixes to JSON files. | 2016-01-16 19:09:36 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | d8efbb2173 | Change netspecs to real values. | 2016-01-16 18:35:07 +01:00 |  | 
			
				
					| 
							
							
								 arkpar | 77c5b315df | Spec name; uncle reward calculation fixed | 2016-01-15 01:17:23 +01:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 7634d60a97 | Add tests module, add two more transaction tests. | 2016-01-12 12:22:18 +01:00 |  |