Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

eth/main.cpp

@@ -136,7 +136,7 @@ void help()
 		<< "    -K,--kill  First kill the blockchain." << endl
 		<< "    -R,--rebuild  Rebuild the blockchain from the existing database." << endl
 		<< "    --rescue  Attempt to rescue a corrupt database." << endl
-		<< "    --genesis-nonce <nonce>  Set the Genesis Nonce to the given hex nonce." << endl
+		<< "    --genesis-json <file>  Import the genesis block information from the given json file." << endl
 		<< "    -s,--import-secret <secret>  Import a secret key into the key store and use as the default." << endl
 		<< "    -S,--import-session-secret <secret>  Import a secret key into the key store and use as the default for this session only." << endl
 		<< "    --sign-key <address>  Sign all transactions with the key of the given address." << endl

ethminer/MinerAux.h

@@ -471,6 +471,11 @@ private:
 
 	void doFarm(MinerType _m, string const& _remote, unsigned _recheckPeriod)
 	{
+		map<string, GenericFarm<EthashProofOfWork>::SealerDescriptor> sealers;
+		sealers["cpu"] = GenericFarm<EthashProofOfWork>::SealerDescriptor{&EthashCPUMiner::instances, [](GenericMiner<EthashProofOfWork>::ConstructionInfo ci){ return new EthashCPUMiner(ci); }};
+#if ETH_ETHASHCL
+		sealers["opencl"] = GenericFarm<EthashProofOfWork>::SealerDescriptor{&EthashGPUMiner::instances, [](GenericMiner<EthashProofOfWork>::ConstructionInfo ci){ return new EthashGPUMiner(ci); }};
+#endif
 		(void)_m;
 		(void)_remote;
 		(void)_recheckPeriod;
@@ -479,6 +484,7 @@ private:
 
 		Farm rpc(client);
 		GenericFarm<EthashProofOfWork> f;
+		f.setSealers(sealers);
 		if (_m == MinerType::CPU)
 			f.start("cpu");
 		else if (_m == MinerType::GPU)