Changeset 2087 for branches/casa-prerelease
- Timestamp:
 - 04/01/11 13:23:22 (15 years ago)
 - Location:
 - branches/casa-prerelease/pre-asap
 - Files:
 - 
      
- 11 edited
 
- 
          
  . (modified) (1 prop)
 - 
          
  Makefile (modified) (1 prop)
 - 
          
  SConstruct (modified) (1 prop)
 - 
          
  apps (modified) (1 prop)
 - 
          
  external-alma (modified) (1 prop)
 - 
          
  external-alma/atnf/pks/pks_maths.cc (modified) (1 prop)
 - 
          
  getsvnrev.sh (modified) (1 prop)
 - 
          
  python (modified) (1 prop)
 - 
          
  python/CMakeLists.txt (modified) (1 diff)
 - 
          
  src (modified) (1 prop)
 - 
          
  src/SConscript (modified) (1 prop)
 
 
Legend:
- Unmodified
 - Added
 - Removed
 
- 
      
branches/casa-prerelease/pre-asap
 - 
      
branches/casa-prerelease/pre-asap/Makefile
- Property svn:mergeinfo changed (with no actual effect on merging)
 
 - 
      
branches/casa-prerelease/pre-asap/SConstruct
- Property svn:mergeinfo changed (with no actual effect on merging)
 
 - 
      
branches/casa-prerelease/pre-asap/apps
- Property svn:mergeinfo changed (with no actual effect on merging)
 
 - 
      
branches/casa-prerelease/pre-asap/external-alma
- Property svn:mergeinfo changed (with no actual effect on merging)
 
 - 
      
branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc
- Property svn:mergeinfo changed (with no actual effect on merging)
 
 - 
      
branches/casa-prerelease/pre-asap/getsvnrev.sh
- Property svn:mergeinfo changed (with no actual effect on merging)
 
 - 
      
branches/casa-prerelease/pre-asap/python
- Property svn:mergeinfo changed
/trunk/python merged: 2086  
 - Property svn:mergeinfo changed
 - 
      
branches/casa-prerelease/pre-asap/python/CMakeLists.txt
r1996 r2087 37 37 ${PYTHONDIR}/selector.py 38 38 ${PYTHONDIR}/simplelinefinder.py 39 ${PYTHONDIR}/utils.py ) 39 ${PYTHONDIR}/utils.py 40 ${PYTHONDIR}/svninfo.txt ) 40 41 41 42 install( PROGRAMS ${PYTHON_MODULES}  - 
      
branches/casa-prerelease/pre-asap/src
- Property svn:mergeinfo changed (with no actual effect on merging)
 
 - 
      
branches/casa-prerelease/pre-asap/src/SConscript
- Property svn:mergeinfo changed (with no actual effect on merging)
 
 
  Note:
 See   TracChangeset
 for help on using the changeset viewer.
  