Merge branch 'CMSSW_7_6_X' of https://github.com/wouf/cmssw into CMSS… · cgalloni/cmssw@62c5fae · GitHub

Commit

Merge branch 'CMSSW_7_6_X' of https://github.com/wouf/cmssw into CMSS…

Browse files

…W_7_6_X

Conflicts:
	GeneratorInterface/HydjetInterface/test/HydjetAnalyzer.cc

Loading branch information

Andrey committed Oct 29, 2015

2 parents eeb8d36 + 092b8f7 commit 62c5fae