From 937c07b7a2b8ae864c0117f9084b6706accf2af6 Mon Sep 17 00:00:00 2001
From: Ron Sluiter <rsluiter@users.noreply.github.com>
Date: Tue, 30 Aug 2011 22:05:42 +0000
Subject: [PATCH] NewportModel 2 and 3 merged back to one Newport lib.

---
 xxxApp/src/Makefile             | 2 +-
 xxxApp/src/xxxCommonInclude.dbd | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/xxxApp/src/Makefile b/xxxApp/src/Makefile
index e184d70..90fa8bf 100644
--- a/xxxApp/src/Makefile
+++ b/xxxApp/src/Makefile
@@ -192,7 +192,7 @@ xxx_Common_LIBS += optics
 xxx_Common_LIBS += std
 xxx_Common_LIBS += ip
 xxx_Common_LIBS += Acs acsTech80 Aerotech Attocube Faulhaber Ims KohzuMotor Mclennan
-xxx_Common_LIBS += Micos MicroMo NewFocus NewportModel3 Newport Oriel PI PIJena Parker SmartMotor
+xxx_Common_LIBS += Micos MicroMo NewFocus Newport Oriel PI PIJena Parker SmartMotor
 xxx_Common_LIBS += ThorLabs softMotor motorSimSupport motor
 #xxx_Common_LIBS += simDetector NDPlugin netCDF ADBase
 xxx_Common_LIBS += asyn
diff --git a/xxxApp/src/xxxCommonInclude.dbd b/xxxApp/src/xxxCommonInclude.dbd
index 2bbf26e..42f5256 100644
--- a/xxxApp/src/xxxCommonInclude.dbd
+++ b/xxxApp/src/xxxCommonInclude.dbd
@@ -48,7 +48,6 @@ include "devMicroMo.dbd"
 #include "devMXmotor.dbd"
 include "devNewFocus.dbd"
 include "devNewport.dbd"
-include "devNewportModel3.dbd"
 include "devOriel.dbd"
 include "devPC6K.dbd"
 include "devPIJena.dbd"
-- 
GitLab