Changeset 1305 for trunk


Ignore:
Timestamp:
11/29/06 12:02:15 (18 years ago)
Author:
mar637
Message:

merge from asap2.1.1 release tag

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile

    r1295 r1305  
    1 PREFIX := /Library/Frameworks/Python.framework/Versions/2.4
    2 PYDIR := $(PREFIX)/lib/python2.4/site-packages
    3 
    41ifndef ASAPROOT
    52   ASAPROOT := $(shell pwd)
    63endif
    74
     5PREFIX := /Library/Frameworks/Python.framework/Versions/2.4
     6PYDIR := $(PREFIX)/lib/python2.4/site-packages
     7
     8
    89PY := $(wildcard python/*.py)
    9 LIBS := /tmp/_asap.so
     10LIBS := src/_asap.so
    1011BINS := bin/asap
    1112
  • trunk/SConstruct

    r1280 r1305  
    7979    env = conf.Finish()
    8080
    81 env["version"] = "2.1.1b"
     81env["version"] = "2.1.1"
    8282
    8383# general CPPFLAGS
  • trunk/doc/CHANGELOG

    r1295 r1305  
    22=========
    33
    4 Minor Release 2.1.1 []
     4Minor Release 2.1.1 [2006-11-09]
    55
    66* fix for Ticket #88 - numpy masks
     
    99* ticket #64 - speed up of auto_poly_baseline
    1010* fix for ticket #89 - export of IF sub-selections
     11* fix for Ticket #83 - export to ms2 crashed asap
     12* added file suffix support for name.rpf.1 etc.
    1113
    1214Release Version 2.1.0 [2006-09-11]
  • trunk/python/__init__.py

    r1295 r1305  
    358358
    359359__date__ = '$Date$'.split()[1]
    360 __version__  = '2.1.1b'
     360__version__  = '2.1.1'
    361361
    362362def is_ipython():
  • trunk/src/STWriter.cpp

    r1295 r1305  
    124124  Vector<Bool> havexpol(nIF);
    125125  nPol = 0;nChan = 0; havexpol = False;
    126   for (int i=0;i<ifs.size();++i) {
     126  for (uint i=0;i<ifs.size();++i) {
    127127    nPol(ifs[i]) = in->npol();
    128128    nChan(ifs[i]) = in->nchan(ifs[i]);
  • trunk/web/index.html

    r1295 r1305  
    7171<b class="asap">ASAP</b> project tracking page</a>. Please also check if the defect has already been submitted under
    7272<a href="http://sourcecode.atnf.csiro.au/cgi-bin/trac_asap.cgi/report/1">current tickets</a>.
    73 
     73If the trac system tells you that your submission has been considered spam, please log in with the username "bugs" and password "mops".
    7474
    7575<h2>Documentation</h2>
     
    118118  <li><b class="asap">ASAP</b> source code is available through our subversion repository
    119119    <pre>
    120         svn co http://sourcecode.atnf.csiro.au/repos/asap/tags/Release2.1.1 asap2.1.1
     120        svn co http://sourcecode.atnf.csiro.au/repos/asap/tags/asap2.1.1
    121121    </pre>
    122122  </li>
Note: See TracChangeset for help on using the changeset viewer.