[NeXus-code-svn] r1245 - in branches/4.2: . InstallerBits InstallerBits/Licences macosx_install_kit macosx_install_kit/Resources macosx_install_kit/Resources/English.lproj macosx_install_kit/bin

[apache at nexusformat.org]

Author: Freddie Akeroyd
Date: Tue Apr 21 12:32:02 2009
New Revision: 1245

Added:
   branches/4.2/InstallerBits/
      - copied from r1244, /trunk/InstallerBits/
   branches/4.2/InstallerBits/Licences/
      - copied from r1244, /trunk/InstallerBits/Licences/
   branches/4.2/InstallerBits/Licences/AUTHORS.txt
      - copied unchanged from r1244, /trunk/InstallerBits/Licences/AUTHORS.txt
   branches/4.2/InstallerBits/Licences/COPYING.rtf
      - copied unchanged from r1244, /trunk/InstallerBits/Licences/COPYING.rtf
   branches/4.2/InstallerBits/Licences/COPYING.txt
      - copied unchanged from r1244, /trunk/InstallerBits/Licences/COPYING.txt
   branches/4.2/InstallerBits/Licences/COPYING_hdf4.txt
      - copied unchanged from r1244, /trunk/InstallerBits/Licences/COPYING_hdf4.txt
   branches/4.2/InstallerBits/Licences/COPYING_hdf5.txt
      - copied unchanged from r1244, /trunk/InstallerBits/Licences/COPYING_hdf5.txt
   branches/4.2/InstallerBits/Licences/COPYING_iconv.txt
      - copied unchanged from r1244, /trunk/InstallerBits/Licences/COPYING_iconv.txt
   branches/4.2/InstallerBits/Licences/COPYING_libxml2.txt
      - copied unchanged from r1244, /trunk/InstallerBits/Licences/COPYING_libxml2.txt
   branches/4.2/InstallerBits/Licences/COPYING_nexus.txt
      - copied unchanged from r1244, /trunk/InstallerBits/Licences/COPYING_nexus.txt
   branches/4.2/InstallerBits/Licences/COPYING_zlib.txt
      - copied unchanged from r1244, /trunk/InstallerBits/Licences/COPYING_zlib.txt
   branches/4.2/macosx_install_kit/
      - copied from r1244, /trunk/macosx_install_kit/
   branches/4.2/macosx_install_kit/ReadMe.txt
      - copied unchanged from r1244, /trunk/macosx_install_kit/ReadMe.txt
   branches/4.2/macosx_install_kit/Resources/
      - copied from r1244, /trunk/macosx_install_kit/Resources/
   branches/4.2/macosx_install_kit/Resources/English.lproj/
      - copied from r1244, /trunk/macosx_install_kit/Resources/English.lproj/
   branches/4.2/macosx_install_kit/Resources/English.lproj/Conclusion.txt
      - copied unchanged from r1244, /trunk/macosx_install_kit/Resources/English.lproj/Conclusion.txt
   branches/4.2/macosx_install_kit/Resources/English.lproj/Description.plist
      - copied unchanged from r1244, /trunk/macosx_install_kit/Resources/English.lproj/Description.plist
   branches/4.2/macosx_install_kit/Resources/English.lproj/License.txt
      - copied unchanged from r1244, /trunk/macosx_install_kit/Resources/English.lproj/License.txt
   branches/4.2/macosx_install_kit/Resources/English.lproj/ReadMe.txt
      - copied unchanged from r1244, /trunk/macosx_install_kit/Resources/English.lproj/ReadMe.txt
   branches/4.2/macosx_install_kit/Resources/English.lproj/Welcome.txt
      - copied unchanged from r1244, /trunk/macosx_install_kit/Resources/English.lproj/Welcome.txt
   branches/4.2/macosx_install_kit/Resources/English.lproj/background.jpg
      - copied unchanged from r1244, /trunk/macosx_install_kit/Resources/English.lproj/background.jpg
   branches/4.2/macosx_install_kit/Resources/postflight
      - copied unchanged from r1244, /trunk/macosx_install_kit/Resources/postflight
   branches/4.2/macosx_install_kit/Resources/preflight
      - copied unchanged from r1244, /trunk/macosx_install_kit/Resources/preflight
   branches/4.2/macosx_install_kit/bin/
      - copied from r1244, /trunk/macosx_install_kit/bin/
   branches/4.2/macosx_install_kit/bin/dmgpack.sh
      - copied unchanged from r1244, /trunk/macosx_install_kit/bin/dmgpack.sh
   branches/4.2/macosx_install_kit/bin/makepkg.sh
      - copied unchanged from r1244, /trunk/macosx_install_kit/bin/makepkg.sh
   branches/4.2/macosx_install_kit/build_mac_kit.sh
      - copied unchanged from r1244, /trunk/macosx_install_kit/build_mac_kit.sh
   branches/4.2/macosx_install_kit/pkg.config.in
      - copied unchanged from r1244, /trunk/macosx_install_kit/pkg.config.in
Modified:
   branches/4.2/configure.ac

Log:
merge changes r1241:r1244 from trunk. Refs #115


Modified: branches/4.2/configure.ac
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.2/configure.ac?r1=1244&r2=1245