wmoore28/epics — pull request #16 by nerses73 (2014-11-19 18:02:53+00:00)
Title: Fixes the HV application and adds the HPS collimator

In the pull request there are files those shouldn't be here. Please see the detailed comments about each file below:

apps/harp_genericApp/Db/hps_collimators.db -- accept changes (hps collimator)
apps/harp_genericApp/medm/hps_collimator.adl -- accept changes (hps collimator)
apps/Makefile -- ignore this file (should not be different from your version)
apps/chillerApp/op/medm/chiller.adl -- ignore this file
apps/configure/RELEASE -- accpet changes (added EPICS_EXTENSIONS)
apps/generalApp/Makefile -- accept changes (disabling makeing in th ar directory)
apps/generalApp/alh/Makefile -- accept changes (fixed the name of file used by Makefile)
apps/generalApp/ar/Makefile -- ignore this file or delete (archiver is not going to be used so I would delete entire apps/generalApp/ar)
apps/generalApp/medm/ioc_alive.adl -- ignore this file (tried to merge to your version manually)
apps/generalApp/scripts/#make_elog_entry.pl# -- accept changes (this file should not be in the repository)
apps/generalApp/strip/.gitignore -- ignore this file
apps/hvcaApp/DB/Makefile -- accept changes (commented out the automatic generation of ecal.dat from ecal.pl)
apps/hvcaApp/DB/bm.dat -- accept changes (beamline PMTes changes requested by FX and Stepan)
apps/hvcaApp/DB/ecal.dat -- accept changes (somehow an old version went into github this is correct version)
apps/iocBoot/iocECal_Voltages/Makefile -- accept changes (added and doing nothing Makefile so it will not fail if called recursively)
apps/iocBoot/iocECal_Voltages/envPaths -- accept changes (initial version of environment, should not be overwriten by make)
apps/iocBoot/iocECal_Voltages/st.cmd -- accept changes (initial verion of startup configuration)
apps/iocBoot/iocchiller/st.cmd -- ignore this file
apps/linkmaker.sh -- ignore this file
apps/mpodCratesApp/src/Makefile -- ignore this file