From ea9d141a546e6ad6ac95433aa0bb3d0393cda4e2 Mon Sep 17 00:00:00 2001
From: Jeff Hill <johill@lanl.gov>
Date: Mon, 14 Nov 1994 18:48:45 +0000
Subject: [PATCH] dded caenV265

---
 src/drv/Makefile.Vx | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/drv/Makefile.Vx b/src/drv/Makefile.Vx
index fe54fdb85..8d0addbb9 100644
--- a/src/drv/Makefile.Vx
+++ b/src/drv/Makefile.Vx
@@ -5,6 +5,18 @@ include $(EPICS)/config/CONFIG_BASE
 USR_CFLAGS = -fshared-data -fvolatile -mnobitfield -traditional
 
 
+<<<<<<< Makefile.Vx
+SRCS = \
+	../module_types.c ../drvXy010.c ../drvAb.c ../drvBb902.c \
+	../drvBb910.c ../drvCompuSm.c ../drvDvx.c ../drvMz8310.c \
+	../drvOms.c ../drvStc.c ../drvTime.c ../drvVmi4100.c \
+	../drvXy210.c ../drvXy220.c ../drvXy240.c \
+	../drvXy566.c ../drvAt5Vxi.c ../drvHp1404a.c ../drvEpvxi.c \
+	../drvEpvxiMsg.c ../drvBitBus.c ../drvGpib.c \
+	../drvMsg.c ../drvBB232.c ../drvHpe1368a.c ../drvHpe1445a.c \
+	../drvKscV215.c ../drvComet.c ../drvJgvtr1.c ../drvFp.c \
+	../drvMvme162.c ../drvFpm.c ../drvCaenV265.c
+=======
 SRCS.c = \
 	../module_types.c\
 	../drvXy010.c\
@@ -38,8 +50,19 @@ SRCS.c = \
 	../drvFp.c\
 	../drvMvme162.c\
 	../drvFpm.c
+>>>>>>> 1.14
 
 OBJS = \
+<<<<<<< Makefile.Vx
+	module_types.o drvXy010.o drvAb.o drvBb902.o \
+	drvBb910.o drvCompuSm.o drvDvx.o drvMz8310.o \
+	drvOms.o drvStc.o drvTime.o drvVmi4100.o \
+	drvXy210.o drvXy220.o drvXy240.o drvXy566.o drvAt5Vxi.o \
+	drvHp1404a.o drvEpvxi.o drvEpvxiMsg.o drvGpib.o \
+	drvMsg.o drvBB232.o drvHpe1368a.o drvHpe1445a.o \
+	drvKscV215.o drvComet.o drvJgvtr1.o drvFp.o \
+	drvMvme162.o drvFpm.o drvCaenV265.o
+=======
 	module_types.o\
 	drvXy010.o\
 	drvAb.o\
@@ -72,6 +95,7 @@ OBJS = \
 	drvFp.o\
 	drvMvme162.o\
 	drvFpm.o
+>>>>>>> 1.14
 
 PROD = drvSup