#
# ChangeLog for branches/mergetest/share/ipythonrc-asap
#
# Generated by Trac 1.6
# 08/06/25 06:05:06

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, 06 Nov 2006 11:22:03 GMT mar637 [1295]
	* trunk/Doxyfile (copied)
	* trunk/Makefile (modified)
	* trunk/doc/CHANGELOG (modified)
	* trunk/monitor/cgi-bin/asapmon.py (modified)
	* trunk/monitor/cgi-bin/filelist.py (modified)
	* trunk/python/__init__.py (modified)
	* trunk/python/asapfitter.py (modified)
	* trunk/python/asapplotter.py (modified)
	* trunk/python/scantable.py (modified)
	* trunk/scons/casa.py (modified)
	* trunk/share/ipythonrc-asap (modified)
	* trunk/src/LineCatalog.h (modified)
	* trunk/src/Makefile (modified)
	* trunk/src/RowAccumulator.h (modified)
	* trunk/src/STAsciiWriter.cpp (modified)
	* trunk/src/STMath.h (modified)
	* trunk/src/STWriter.cpp (modified)
	* trunk/src/Scantable.h (modified)
	* trunk/web/index.html (modified)

	merge form Release2.1.1 branch


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, 06 Nov 2006 11:22:03 GMT mar637 [1295]
	* trunk/Doxyfile (copied)
	* trunk/Makefile (modified)
	* trunk/doc/CHANGELOG (modified)
	* trunk/monitor/cgi-bin/asapmon.py (modified)
	* trunk/monitor/cgi-bin/filelist.py (modified)
	* trunk/python/__init__.py (modified)
	* trunk/python/asapfitter.py (modified)
	* trunk/python/asapplotter.py (modified)
	* trunk/python/scantable.py (modified)
	* trunk/scons/casa.py (modified)
	* trunk/share/ipythonrc-asap (modified)
	* trunk/src/LineCatalog.h (modified)
	* trunk/src/Makefile (modified)
	* trunk/src/RowAccumulator.h (modified)
	* trunk/src/STAsciiWriter.cpp (modified)
	* trunk/src/STMath.h (modified)
	* trunk/src/STWriter.cpp (modified)
	* trunk/src/Scantable.h (modified)
	* trunk/web/index.html (modified)

	merge form Release2.1.1 branch


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, 06 Nov 2006 11:22:03 GMT mar637 [1295]
	* trunk/Doxyfile (copied)
	* trunk/Makefile (modified)
	* trunk/doc/CHANGELOG (modified)
	* trunk/monitor/cgi-bin/asapmon.py (modified)
	* trunk/monitor/cgi-bin/filelist.py (modified)
	* trunk/python/__init__.py (modified)
	* trunk/python/asapfitter.py (modified)
	* trunk/python/asapplotter.py (modified)
	* trunk/python/scantable.py (modified)
	* trunk/scons/casa.py (modified)
	* trunk/share/ipythonrc-asap (modified)
	* trunk/src/LineCatalog.h (modified)
	* trunk/src/Makefile (modified)
	* trunk/src/RowAccumulator.h (modified)
	* trunk/src/STAsciiWriter.cpp (modified)
	* trunk/src/STMath.h (modified)
	* trunk/src/STWriter.cpp (modified)
	* trunk/src/Scantable.h (modified)
	* trunk/web/index.html (modified)

	merge form Release2.1.1 branch


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