#
# ChangeLog for branches/mergetest/web/images
#
# Generated by Trac 1.6
# 08/28/25 11:47:59

Fri, 25 Feb 2011 03:09:24 GMT Kana Sugimoto [2010]
	* branches/mergetest (deleted)

	Removing an old test branch


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

	Recreating the branch for recover testing


Mon, 11 Sep 2006 05:10:05 GMT mar637 [1259]
	* trunk/SConstruct (modified)
	* trunk/admin/reqmatrix.sxc (modified)
	* trunk/doc/CHANGELOG (modified)
	* trunk/doc/SConscript (copied)
	* trunk/doc/userguide.tex (modified)
	* trunk/python/__init__.py (modified)
	* trunk/python/asaplotbase.py (modified)
	* trunk/python/asapplotter.py (modified)
	* trunk/python/linecatalog.py (modified)
	* trunk/python/scantable.py (modified)
	* trunk/src/LineCatalog.cpp (modified)
	* trunk/src/LineCatalog.h (modified)
	* trunk/src/Makefile (modified)
	* trunk/src/STMath.cpp (modified)
	* trunk/src/STPolCircular.cpp (modified)
	* trunk/src/STWriter.cpp (modified)
	* trunk/src/python_Scantable.cpp (modified)
	* trunk/test/file-io.py (modified)
	* trunk/web/commands.html (modified)
	* trunk/web/images/logo.png (copied)
	* trunk/web/images/logo.xcf (copied)
	* trunk/web/index.html (modified)

	Merge from Release2.1.0b tag


Mon, 02 Aug 2010 08:35:49 GMT Kana Sugimoto [1821]
	* branches/mergetest (deleted)

	Removing branch for replacing


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


Mon, 11 Sep 2006 05:10:05 GMT mar637 [1259]
	* trunk/SConstruct (modified)
	* trunk/admin/reqmatrix.sxc (modified)
	* trunk/doc/CHANGELOG (modified)
	* trunk/doc/SConscript (copied)
	* trunk/doc/userguide.tex (modified)
	* trunk/python/__init__.py (modified)
	* trunk/python/asaplotbase.py (modified)
	* trunk/python/asapplotter.py (modified)
	* trunk/python/linecatalog.py (modified)
	* trunk/python/scantable.py (modified)
	* trunk/src/LineCatalog.cpp (modified)
	* trunk/src/LineCatalog.h (modified)
	* trunk/src/Makefile (modified)
	* trunk/src/STMath.cpp (modified)
	* trunk/src/STPolCircular.cpp (modified)
	* trunk/src/STWriter.cpp (modified)
	* trunk/src/python_Scantable.cpp (modified)
	* trunk/test/file-io.py (modified)
	* trunk/web/commands.html (modified)
	* trunk/web/images/logo.png (copied)
	* trunk/web/images/logo.xcf (copied)
	* trunk/web/index.html (modified)

	Merge from Release2.1.0b tag


Fri, 30 Jul 2010 06:17:42 GMT Kana Sugimoto [1784]
	* branches/mergetest (deleted)

	Removed current mergetest branch for another test.


Thu, 29 Jul 2010 08:05:26 GMT Malte Marquarding [1777]
	* branches/mergetest (copied)
	* branches/mergetest/src/STFiller.cpp (modified)
	* branches/mergetest/src/STMath.cpp (modified)
	* branches/mergetest/src/python_asap.cpp (modified)
	* branches/mergetest/src/python_asap.h (modified)

	Created branch to test alma merge back into trunk


Mon, 11 Sep 2006 05:10:05 GMT mar637 [1259]
	* trunk/SConstruct (modified)
	* trunk/admin/reqmatrix.sxc (modified)
	* trunk/doc/CHANGELOG (modified)
	* trunk/doc/SConscript (copied)
	* trunk/doc/userguide.tex (modified)
	* trunk/python/__init__.py (modified)
	* trunk/python/asaplotbase.py (modified)
	* trunk/python/asapplotter.py (modified)
	* trunk/python/linecatalog.py (modified)
	* trunk/python/scantable.py (modified)
	* trunk/src/LineCatalog.cpp (modified)
	* trunk/src/LineCatalog.h (modified)
	* trunk/src/Makefile (modified)
	* trunk/src/STMath.cpp (modified)
	* trunk/src/STPolCircular.cpp (modified)
	* trunk/src/STWriter.cpp (modified)
	* trunk/src/python_Scantable.cpp (modified)
	* trunk/test/file-io.py (modified)
	* trunk/web/commands.html (modified)
	* trunk/web/images/logo.png (copied)
	* trunk/web/images/logo.xcf (copied)
	* trunk/web/index.html (modified)

	Merge from Release2.1.0b tag


Thu, 29 Jul 2010 08:04:54 GMT Malte Marquarding [1776]
	* branches/mergetest (deleted)

	Wrong way around


Thu, 29 Jul 2010 08:04:19 GMT Malte Marquarding [1775]
	* branches/mergetest (copied)

	Created branch to test alma merge back into trunk


Tue, 17 Jul 2007 00:41:55 GMT Malte Marquarding [1386]
	* branches/alma (copied)
	* branches/alma/src/STFitter.h (modified)
	* branches/alma/src/STHeader.h (modified)
	* branches/alma/src/python_STFiller.cpp (modified)

	created alma branch for NRAO