merge
Description
Description
Details
Details
- Provenance
dgrell Authored on Oct 14 2016, 2:38 PM - Parents
- R563:bd1fa13edae9: works with HW7
R563:68d2d99d7469: Major merge of Johannes' and Stephen's branches - 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.
- 0e8407d8a2e0 merged with trunkAuthor
- f02faa7e626d Examples of terminal colour usage.Author
- 8868747f766e merged with trunkAuthor
- 8b8ad3cf9384 Updated authors in header files.Author
- d92c937a6a90 buildfix for older compilersAuthor
- fe49c2a8bcf9 Some fixes to event record loops.Author
- 287bad130370 Fixed = to ==.Author
- 160fdce319db merged with fixed trunkAuthor
- 5ee16f0fecf5 merged with trunkAuthor
- c25264205aea adding more testsAuthor
- 1d13cdd28dd6 merged with trunkAuthor
- fa5e0faee4b0 fix in testAuthor
- d1a1aa89aff9 Add Top decay test for dipole showerAuthor
- c0df874dafbe merged with trunkAuthor
- 6e920d7454b0 changed folder of CMWSchemesAuthor
- 5d8dcf0314d5 merged with trunkAuthor
- a909585c0533 remove make_pair form DipoleShowerAuthor
- 94f4c8021f03 more commentsAuthor
- 93493465326a minor fixes and more explanationAuthor
- be87445bdced rest of stephens stuffAuthor
- 85448558d343 subnodes dont know MergingHelperAuthor
- da1cd742744e cleaner stucktureAuthor
- 1221521079c6 initial Merger cleanupAuthor
- 499cb4439bc2 remove clustersafe + cleanupAuthor
- 4d7ff316a08d Cleanup in factoryAuthor
- b069dc51bbb7 major cleanup, rm MScaleAuthor