summaryrefslogtreecommitdiffstats
path: root/clang/test
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2015-02-04 01:51:12 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2015-02-04 01:51:12 +0000
commit90fff92b34ce0d23fc823afb2d9bc6f998ec4cba (patch)
tree88a1f38cab112b597fe0ebd7bb9ff3681390c560 /clang/test
parent7483d20e77eaf51a77a2105bbdbf1fec8e16e680 (diff)
downloadbcm5719-llvm-90fff92b34ce0d23fc823afb2d9bc6f998ec4cba.tar.gz
bcm5719-llvm-90fff92b34ce0d23fc823afb2d9bc6f998ec4cba.zip
Add missing file from r228104.
llvm-svn: 228105
Diffstat (limited to 'clang/test')
-rw-r--r--clang/test/Modules/Inputs/merge-template-members/merge.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/merge-template-members/merge.h b/clang/test/Modules/Inputs/merge-template-members/merge.h
new file mode 100644
index 00000000000..72d2d3622e8
--- /dev/null
+++ b/clang/test/Modules/Inputs/merge-template-members/merge.h
@@ -0,0 +1,2 @@
+#include "b1.h"
+#include "b2.h"
OpenPOWER on IntegriCloud