Commits · d1a5c46c9f2f6e2507a686b27a74248734f0e76d · Lawrence Davou Christopher / athena

Aug 30, 2017

Merge branch 'master-ftk-track-overlap-removal' into 'master' · 785a04bc

Andy Haas authored 7 years ago

Master ftk track overlap removal

See merge request !3063
Conflicts:

	Trigger/TrigFTK/FTK_DataProviderSvc/src/FTK_DataProviderSvc.cxx


Former-commit-id: d8508d1c

785a04bc

Aug 29, 2017
- Merge branch 'master-ftk-track-overlap-removal' into 'master' · 57088c9f
  Marcin Nowak authored 7 years ago and Andrew Haas committed 7 years ago
  
  Master ftk track overlap removal See merge request !3063 Former-commit-id: 8d755685f019ca0edb97dc32f423f41e8c934a67
  57088c9f
Apr 04, 2017
- Add .asetup* to .gitignore, cherry-pick from master · 360bf187
  Graeme Stewart authored 8 years ago
  
  Former-commit-id: f0c527b5a850fca07e0c8e9de99c967cc4d6d65d
  360bf187
Feb 03, 2017
- Add a sensible gitignore file · 168e4f35
  Graeme A Stewart authored 8 years ago
  
  Former-commit-id: 8a837ce9
  168e4f35