merged from release-2-6 branch
Description
Description
Details
Details
- Provenance
dgrell Authored on - Parents
- rRIVETHGe31a43fb3a2d: Re-instate Chris's fix, it was correct all along. Sorry!
rRIVETHG93503ecc86f7: merged from release-2-6 branch - Branches
- Unknown
- Tags
- Unknown
Event Timeline
Merged Changes
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
- 93503ecc86f7 merged from release-2-6 branchAuthor
- 050ec56380d9 Merge from trunk (to get 2.6)Author
- d4751a332d82 Fixed ATLAS_2011_S9126244Author
- 334bc7a119fa require hepmc >= 2.06.09Author
- 42e0fe40dfe1 Add constructor from nullptrAuthor
- 54d01297335b correct seg fault in finalizeAuthor
- c1b570c41def update changelogAuthor
- 7ce12455db8e Disable two more broken analysesAuthor
- e715fee9a00f Merge from defaultAuthor
- c0927c9b5db6 Re-enable all binnedhisto analysesAuthor
- 8eaef5080f96 Fix analysis crashesAuthor
- c0e777a77265 Fix out-of-source testingAuthor
- cafa435271dc Fix asciidoc out-of-sourceAuthor
- a5b51ab2c363 Cannot book in constructorAuthor
- fdd45162298a Merged from defaultAuthor
- d1c6ca56bde1 more ATLAS analyses.....Author
- ffec8e8b7dc0 more ATLAS analysesAuthor
- 5493663e7cf8 starting ATLASAuthor
- 378a64b0a09c update version numberAuthor
- ccf3ab8ffee4 Merge back of ptrfix branchAuthor