commit e242f2dc646f41e9162aaaf74e057ce39fcb92df
author Jim Flynn <jim.flynn@arm.com> Wed May 22 14:24:13 2019 +0100
committer Jim Flynn <jim.flynn@arm.com> Tue May 28 17:50:33 2019 +0100
tree d6c49b559c34d1d306b1e901501dded1c18f71c5
parent 2f2778f36e59537bbd47fb8b21e73c6c5a949584

IVGCVSW-3119 Rename MergerLayer to ConcatLayer

!android-nn-driver:1210

Change-Id: I940b3b9e421c92bfd55ae996f7bc54ac077f2604
Signed-off-by: Jim Flynn <jim.flynn@arm.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6c9776..c9ca70e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -227,6 +227,8 @@
     src/armnn/layers/BatchNormalizationLayer.cpp
     src/armnn/layers/BatchToSpaceNdLayer.hpp
     src/armnn/layers/BatchToSpaceNdLayer.cpp
+    src/armnn/layers/ConcatLayer.hpp
+    src/armnn/layers/ConcatLayer.cpp
     src/armnn/layers/ConstantLayer.hpp
     src/armnn/layers/ConstantLayer.cpp
     src/armnn/layers/Convolution2dLayer.hpp
@@ -271,8 +273,6 @@
     src/armnn/layers/MemCopyLayer.cpp
     src/armnn/layers/MergeLayer.hpp
     src/armnn/layers/MergeLayer.cpp
-    src/armnn/layers/MergerLayer.hpp
-    src/armnn/layers/MergerLayer.cpp
     src/armnn/layers/MinimumLayer.cpp
     src/armnn/layers/MinimumLayer.hpp
     src/armnn/layers/MultiplicationLayer.hpp