#
# ChangeLog for branches/mergetest/share/ipythonrc-asap
#
# Generated by Trac 1.2.3
# 07/04/24 15:24:06

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