By-eye merge with 27x branch head. Now to make it compile again. Let's never, ever have branch divergence like this again...
Description
Description
Details
Details
- Provenance
buckley Authored on buckley Pushed on Jun 3 2019, 10:42 PM - Parents
- rRIVETHG7e7c8740907b: Include missing UnstableParticles header
rRIVETHG0bac60ab4bad: Final tweaks: now get a clean compilation - 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.
- 07aec20c4a41 keeping upAuthor
- f21601ad67bb More GCC compilation fixesAuthor
- b1f16cc7058c OMG IT ACTUALLY COMPILESAuthor
- cf8cbc2423af Nearly thereAuthor
- dca7dedb44a8 A bit furtherAuthor
- f2a776930a02 Baby steps toward compilation...Author
- e7a1cc8491a3 Tidying cf. 27xAuthor
- 88d0d958c92d Fix overflowAuthor
- f5bab6a9e2e8 IndentationAuthor
- 7294f8005c44 Supply all required std:: prefixesAuthor
- 420b863b86e2 Cosmetics onlyAuthor
- 79dc90bdea30 Cosmetics onlyAuthor
- 390d2b4ea8f3 Update to bugfixed eigenAuthor
- 39e94595ee93 Merge from 2.6.1 releaseAuthor
- 1c126cabc86a Remove deprecated PID functionsAuthor
- d5ca86b7f4cc Remove deprecated pdgIdAuthor
- 896caadab831 Remove unused filesAuthor
- f48251d01546 Remove deprecated makeAxisCodeAuthor
- 805907460847 Remove deprecated MAXDOUBLEAuthor
- 5498ddc0b5c3 Remove deprecated boostVectorAuthor
- f033b240be51 Remove deprecated threeChargeAuthor
- e0e9d48204c3 Remove deprecated addProjectionAuthor
Very Large Commit
This commit is very large, and affects more than 1000 files. Changes are not shown.