[SCM] pythia8: PYTHIA event generator (C++) of high energy physics branch, master, updated. upstream/8.1.70-13-ga4d93cf

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 5f9e0585938898df7154457d148a7ab7259bf973
Merge: 793c0e64c774fdbc2224fe1b698413ed2d4d4325 7dbfac09afe6f79f66ec7ef1e08cee6db0b5f1ed
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Wed Mar 6 09:35:49 2013 +0800

    Merge tag 'upstream/8.1.75'
    
    Upstream version 8.1.75
    
    Conflicts:
    	Makefile
    	README
    	examples/main32.cc
    	examples/main32.cmnd
    	examples/main41.cc
    	examples/outref/out01
    	examples/outref/out02
    	examples/outref/out03
    	examples/outref/out04
    	examples/outref/out05
    	examples/outref/out06
    	examples/outref/out07
    	examples/outref/out08
    	examples/outref/out09
    	examples/outref/out10
    	examples/outref/out11
    	examples/outref/out12
    	examples/outref/out13
    	examples/outref/out14
    	examples/outref/out15
    	examples/outref/out16
    	examples/outref/out17
    	examples/outref/out18
    	examples/outref/out19
    	examples/outref/out20
    	examples/outref/out21
    	examples/outref/out22
    	examples/outref/out23
    	examples/outref/out24
    	examples/outref/out25
    	examples/outref/out26
    	examples/outref/out27
    	examples/outref/out28
    	hepmcinterface/HepMCInterface.cc
    	htmldoc/Bibliography.html
    	htmldoc/Diffraction.html
    	htmldoc/EventInformation.html
    	htmldoc/Frontpage.html
    	htmldoc/HepMCInterface.html
    	htmldoc/Index.html
    	htmldoc/LesHouchesAccord.html
    	htmldoc/MatrixElementMerging.html
    	htmldoc/ParticleData.html
    	htmldoc/ProgramMethods.html
    	htmldoc/QCDProcesses.html
    	htmldoc/SampleMainPrograms.html
    	htmldoc/UpdateHistory.html
    	htmldoc/UserHooks.html
    	htmldoc/Version.html
    	include/HepMCInterface.h
    	include/History.h
    	include/Info.h
    	include/MergingHooks.h
    	include/ParticleData.h
    	include/Pythia.h
    	include/SigmaTotal.h
    	include/UserHooks.h
    	phpdoc/Bibliography.php
    	phpdoc/Diffraction.php
    	phpdoc/EventInformation.php
    	phpdoc/Fragmentation.php
    	phpdoc/Frontpage.php
    	phpdoc/HepMCInterface.php
    	phpdoc/Index.php
    	phpdoc/LesHouchesAccord.php
    	phpdoc/MatrixElementMerging.php
    	phpdoc/ParticleData.php
    	phpdoc/ProgramMethods.php
    	phpdoc/QCDProcesses.php
    	phpdoc/SampleMainPrograms.php
    	phpdoc/TimelikeShowers.php
    	phpdoc/UpdateHistory.php
    	phpdoc/UserHooks.php
    	phpdoc/Version.php
    	src/HelicityMatrixElements.cc
    	src/History.cc
    	src/MergingHooks.cc
    	src/MultipartonInteractions.cc
    	src/PartonLevel.cc
    	src/ProcessContainer.cc
    	src/ProcessLevel.cc
    	src/Pythia.cc
    	src/ResonanceDecays.cc
    	src/Settings.cc
    	src/SigmaTotal.cc
    	src/StringFragmentation.cc
    	src/TauDecays.cc
    	xmldoc/Bibliography.xml
    	xmldoc/Diffraction.xml
    	xmldoc/EventInformation.xml
    	xmldoc/Frontpage.xml
    	xmldoc/HepMCInterface.xml
    	xmldoc/Index.xml
    	xmldoc/LesHouchesAccord.xml
    	xmldoc/MatrixElementMerging.xml
    	xmldoc/ParticleData.xml
    	xmldoc/QCDProcesses.xml
    	xmldoc/SampleMainPrograms.xml
    	xmldoc/UpdateHistory.xml
    	xmldoc/UserHooks.xml
    	xmldoc/Version.xml


-- 
pythia8: PYTHIA event generator (C++) of high energy physics