From 1f7b12a92937a96d8f2caaa0348326d9675241f1 Mon Sep 17 00:00:00 2001
From: James Beacham <j.beacham@cern.ch>
Date: Tue, 23 Oct 2018 16:15:51 +0000
Subject: [PATCH] Merge branch '21.0-rename-G4ProfilingTools' into '21.0'

renames preInclude.G4ProfilingTools.py to postInclude...

See merge request atlas/athena!15126

(cherry picked from commit b49c80b565ea1579e48976d8c0515ca4cf7b6885 [formerly a5e3c686273ab39aeb85ac83f8771bd7880c2706])

9f0e2b2c rename postInclude.G4ProfilingTools.py to preInclude.G4ProfilingTools.py

Former-commit-id: a758d0670de02afd980c61e331f544aed0800ff9
---
 Control/AthenaConfiguration/python/iconfTool/gui/__init__.py      | 0
 Control/AthenaKernel/share/ClassName_test.ref                     | 0
 ...Include.G4ProfilingTools.py => preInclude.G4ProfilingTools.py} | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 Control/AthenaConfiguration/python/iconfTool/gui/__init__.py
 mode change 100755 => 100644 Control/AthenaKernel/share/ClassName_test.ref
 rename Simulation/G4Utilities/G4ProfilingTools/share/{postInclude.G4ProfilingTools.py => preInclude.G4ProfilingTools.py} (100%)

diff --git a/Control/AthenaConfiguration/python/iconfTool/gui/__init__.py b/Control/AthenaConfiguration/python/iconfTool/gui/__init__.py
old mode 100644
new mode 100755
diff --git a/Control/AthenaKernel/share/ClassName_test.ref b/Control/AthenaKernel/share/ClassName_test.ref
old mode 100755
new mode 100644
diff --git a/Simulation/G4Utilities/G4ProfilingTools/share/postInclude.G4ProfilingTools.py b/Simulation/G4Utilities/G4ProfilingTools/share/preInclude.G4ProfilingTools.py
similarity index 100%
rename from Simulation/G4Utilities/G4ProfilingTools/share/postInclude.G4ProfilingTools.py
rename to Simulation/G4Utilities/G4ProfilingTools/share/preInclude.G4ProfilingTools.py
-- 
GitLab