[Nsclspectcl-cvscommits] SpecTcl/contrib/calibratedparams Makefile.am, 5.6, 5.7

[Ron F. <ro...@us...>]

Update of /cvsroot/nsclspectcl/SpecTcl/contrib/calibratedparams
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv5689/contrib/calibratedparams

Modified Files:
	Makefile.am 
Log Message:
Resolve conflicts in CHANGELOG from foxbox/thechad development skew


Index: Makefile.am
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/contrib/calibratedparams/Makefile.am,v
retrieving revision 5.6
retrieving revision 5.7
diff -C2 -d -r5.6 -r5.7
*** Makefile.am	16 Mar 2006 14:05:15 -0000	5.6
--- Makefile.am	2 Nov 2006 11:41:01 -0000	5.7
***************
*** 31,35 ****
  
  
! include_HEADERS = CFit.h  CFitCommand.h  CFitCreator.h  CFitFactory.h  \
  	CLinearFit.h  CLinearFitCreator.h CCalibratedParameter.h \
  	CCalibratedParameterCommand.h CCalibratedParameterManager.h
--- 31,35 ----
  
  
! noinst_HEADERS = CFit.h  CFitCommand.h  CFitCreator.h  CFitFactory.h  \
  	CLinearFit.h  CLinearFitCreator.h CCalibratedParameter.h \
  	CCalibratedParameterCommand.h CCalibratedParameterManager.h