#
# ChangeLog for branches/mergetest
#
# Generated by Trac 1.6
# 11/24/24 08:36:43

Fri, 30 Jul 2010 07:10:22 GMT Kana Sugimoto [1790]
	* branches/mergetest/Makefile (copied)
	* branches/mergetest/getsvnrev.sh (copied)

	Committing getsvnrev.sh and Makefile copied from alma branch.


Fri, 30 Jul 2010 06:59:56 GMT Kana Sugimoto [1789]
	* branches/mergetest/apps (modified)
	* branches/mergetest/apps/Makefile (copied)
	* branches/mergetest/apps/asap2to3.cpp (modified)
	* branches/mergetest/external-alma (copied)
	* branches/mergetest/python (modified)
	* branches/mergetest/python/__init__.py (modified)
	* branches/mergetest/python/asapfitter.py (modified)
	* branches/mergetest/python/asaplot.py (modified)
	* branches/mergetest/python/asaplotbase.py (modified)
	* branches/mergetest/python/asaplotgui.py (modified)
	* branches/mergetest/python/asaplotgui_gtk.py (modified)
	* branches/mergetest/python/asaplotgui_qt4.py (copied)
	* branches/mergetest/python/asapmath.py (modified)
	* branches/mergetest/python/asapplotter.py (modified)
	* branches/mergetest/python/asapreader.py (modified)
	* branches/mergetest/python/casatoolbar.py (copied)
	* branches/mergetest/python/compatibility.py (copied)
	* branches/mergetest/python/coordinate.py (copied)
	* branches/mergetest/python/interactivemask.py (copied)
	* branches/mergetest/python/lagflagger.py (copied)
	* branches/mergetest/python/linecatalog.py (modified)
	* branches/mergetest/python/opacity.py (copied)
	* branches/mergetest/python/scantable.py (modified)
	* branches/mergetest/python/selector.py (modified)
	* branches/mergetest/python/simplelinefinder.py (copied)
	* branches/mergetest/src (modified)
	* branches/mergetest/src/IndexedCompare.h (copied)
	* branches/mergetest/src/Lorentzian1D.h (copied)
	* branches/mergetest/src/Lorentzian1D.tcc (copied)
	* branches/mergetest/src/Lorentzian1D2.tcc (copied)
	* branches/mergetest/src/Lorentzian1DParam.h (copied)
	* branches/mergetest/src/Lorentzian1DParam.tcc (copied)
	* branches/mergetest/src/Makefile (copied)
	* branches/mergetest/src/MathUtils.cpp (modified)
	* branches/mergetest/src/MathUtils.h (modified)
	* branches/mergetest/src/RowAccumulator.cpp (modified)
	* branches/mergetest/src/RowAccumulator.h (modified)
	* branches/mergetest/src/SConscript (modified)
	* branches/mergetest/src/STAsciiWriter.cpp (modified)
	* branches/mergetest/src/STAtmosphere.cpp (copied)
	* branches/mergetest/src/STAtmosphere.h (copied)
	* branches/mergetest/src/STCoordinate.h (copied)
	* branches/mergetest/src/STFITSImageWriter.cpp (copied)
	* branches/mergetest/src/STFITSImageWriter.h (copied)
	* branches/mergetest/src/STFiller.cpp (modified)
	* branches/mergetest/src/STFiller.h (modified)
	* branches/mergetest/src/STFitter.cpp (modified)
	* branches/mergetest/src/STFrequencies.cpp (modified)
	* branches/mergetest/src/STFrequencies.h (modified)
	* branches/mergetest/src/STHeader.cpp (modified)
	* branches/mergetest/src/STMath.cpp (modified)
	* branches/mergetest/src/STMath.h (modified)
	* branches/mergetest/src/STMathWrapper.h (modified)
	* branches/mergetest/src/STMolecules.cpp (modified)
	* branches/mergetest/src/STMolecules.h (modified)
	* branches/mergetest/src/STSelector.cpp (modified)
	* branches/mergetest/src/STSelector.h (modified)
	* branches/mergetest/src/STWriter.cpp (modified)
	* branches/mergetest/src/STWriter.h (modified)
	* branches/mergetest/src/Scantable.cpp (modified)
	* branches/mergetest/src/Scantable.h (modified)
	* branches/mergetest/src/ScantableWrapper.h (modified)
	* branches/mergetest/src/Templates.cpp (copied)
	* branches/mergetest/src/python_STAtmosphere.cpp (copied)
	* branches/mergetest/src/python_STCoordinate.cpp (copied)
	* branches/mergetest/src/python_STMath.cpp (modified)
	* branches/mergetest/src/python_STSelector.cpp (modified)
	* branches/mergetest/src/python_Scantable.cpp (modified)
	* branches/mergetest/src/python_SrcType.cpp (copied)
	* branches/mergetest/src/python_asap.cpp (modified)
	* branches/mergetest/src/python_asap.h (modified)

	Merged the all developments from alma branch. copied external-alma.


Fri, 30 Jul 2010 06:20:58 GMT Kana Sugimoto [1785]
	* branches/mergetest (copied)

	Created new mergetest branch from trunk for testing merge from alma


Thu, 29 Jul 2010 05:18:21 GMT Malte Marquarding [1769]
	* trunk/INSTALL (modified)

	testing commit