#
# ChangeLog for branches/mergetest/external-alma
#
# Generated by Trac 1.6
# 12/05/24 12:44:57

Mon, 02 Aug 2010 08:37:37 GMT Kana Sugimoto [1822]
	* branches/mergetest (copied)

	Recreating the branch for recover testing


Mon, 02 Aug 2010 07:28:20 GMT Kana Sugimoto [1819]
	* trunk/Makefile (copied)
	* trunk/SConstruct (modified)
	* trunk/apps (modified)
	* trunk/apps/Makefile (copied)
	* trunk/apps/asap2to3.cpp (modified)
	* trunk/external-alma (copied)
	* trunk/getsvnrev.sh (copied)
	* trunk/python (modified)
	* trunk/python/__init__.py (modified)
	* trunk/python/asapfitter.py (modified)
	* trunk/python/asaplot.py (modified)
	* trunk/python/asaplotbase.py (modified)
	* trunk/python/asaplotgui.py (modified)
	* trunk/python/asaplotgui_gtk.py (modified)
	* trunk/python/asaplotgui_qt4.py (copied)
	* trunk/python/asapmath.py (modified)
	* trunk/python/asapplotter.py (modified)
	* trunk/python/asapreader.py (modified)
	* trunk/python/casatoolbar.py (copied)
	* trunk/python/compatibility.py (copied)
	* trunk/python/coordinate.py (copied)
	* trunk/python/env.py (copied)
	* trunk/python/interactivemask.py (copied)
	* trunk/python/lagflagger.py (copied)
	* trunk/python/linecatalog.py (modified)
	* trunk/python/logging.py (copied)
	* trunk/python/opacity.py (copied)
	* trunk/python/scantable.py (modified)
	* trunk/python/selector.py (modified)
	* trunk/python/simplelinefinder.py (copied)
	* trunk/src (modified)
	* trunk/src/AsapLogSink.cpp (copied)
	* trunk/src/AsapLogSink.h (copied)
	* trunk/src/FillerBase.cpp (copied)
	* trunk/src/FillerBase.h (copied)
	* trunk/src/FillerWrapper.h (copied)
	* trunk/src/IndexedCompare.h (copied)
	* trunk/src/Lorentzian1D.h (copied)
	* trunk/src/Lorentzian1D.tcc (copied)
	* trunk/src/Lorentzian1D2.tcc (copied)
	* trunk/src/Lorentzian1DParam.h (copied)
	* trunk/src/Lorentzian1DParam.tcc (copied)
	* trunk/src/Makefile (copied)
	* trunk/src/MathUtils.cpp (modified)
	* trunk/src/MathUtils.h (modified)
	* trunk/src/NROFiller.cpp (copied)
	* trunk/src/NROFiller.h (copied)
	* trunk/src/PKSFiller.cpp (copied)
	* trunk/src/PKSFiller.h (copied)
	* trunk/src/RowAccumulator.cpp (modified)
	* trunk/src/RowAccumulator.h (modified)
	* trunk/src/SConscript (modified)
	* trunk/src/STAsciiWriter.cpp (modified)
	* trunk/src/STAtmosphere.cpp (copied)
	* trunk/src/STAtmosphere.h (copied)
	* trunk/src/STCoordinate.h (copied)
	* trunk/src/STFITSImageWriter.cpp (copied)
	* trunk/src/STFITSImageWriter.h (copied)
	* trunk/src/STFiller.cpp (modified)
	* trunk/src/STFiller.h (modified)
	* trunk/src/STFitter.cpp (modified)
	* trunk/src/STFrequencies.cpp (modified)
	* trunk/src/STFrequencies.h (modified)
	* trunk/src/STHeader.cpp (modified)
	* trunk/src/STMath.cpp (modified)
	* trunk/src/STMath.h (modified)
	* trunk/src/STMathWrapper.h (modified)
	* trunk/src/STMolecules.cpp (modified)
	* trunk/src/STMolecules.h (modified)
	* trunk/src/STSelector.cpp (modified)
	* trunk/src/STSelector.h (modified)
	* trunk/src/STWriter.cpp (modified)
	* trunk/src/STWriter.h (modified)
	* trunk/src/Scantable.cpp (modified)
	* trunk/src/Scantable.h (modified)
	* trunk/src/ScantableWrapper.h (modified)
	* trunk/src/Templates.cpp (copied)
	* trunk/src/python_Filler.cpp (copied)
	* trunk/src/python_LogSink.cpp (copied)
	* trunk/src/python_STAtmosphere.cpp (copied)
	* trunk/src/python_STCoordinate.cpp (copied)
	* trunk/src/python_STMath.cpp (modified)
	* trunk/src/python_STSelector.cpp (modified)
	* trunk/src/python_Scantable.cpp (modified)
	* trunk/src/python_SrcType.cpp (copied)
	* trunk/src/python_asap.cpp (modified)
	* trunk/src/python_asap.h (modified)

	New Development: No
	            JIRA Issue: No (merge alma branch to ...