Vakhtang Tsulaia authored 6 years ago and Stewart Martin-Haugh committed 6 years ago

More gitignore

See merge request atlas/athena!10019

(cherry picked from commit 8276f3c2 [formerly d39d58ac])

a861566a Remove some emacs temporary files
8a9b6580 Add some binary formats to .gitignore
56a575c7 Remove some KDevelop configurations
c6bd22bb Remove binary and KDE fragments
d2668f85 Add root and tmp.* binary files

Former-commit-id: f77f83827739a86e5fc96980241f71405119c9c8

Master ftk track overlap removal

See merge request !3063
Conflicts:

	Trigger/TrigFTK/FTK_DataProviderSvc/src/FTK_DataProviderSvc.cxx


Former-commit-id: d8508d1c

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

Former-commit-id: f0c527b5

Former-commit-id: 8a837ce9