[Debian-astro-commits] [cpl-plugin-template] 16/76: Merge branch 'upstream' into debian

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository cpl-plugin-template.

commit b513583ea98353d88dda3de609885a629e9ca7a5
Merge: aa8f097 0ccac21
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Sep 16 19:24:33 2013 +0200

    Merge branch 'upstream' into debian

 calib/cal/atmospheric_extinction.fits      |   15 +
 calib/cal/flux_standards.fits              | 2797 ++++++++++++++++++++++++++++
 calib/cal/grating_HR316.fits               |    5 +
 calib/cal/grating_LR600.fits               |    2 +
 calib/cal/line_catalog_ThAr.fits           |   72 +
 calib/cal/line_mask_ThAr_H379.0nm_o15.fits |  Bin 0 -> 11520 bytes
 calib/cal/line_mask_ThAr_H395.8nm_o14.fits |  Bin 0 -> 8640 bytes
 calib/cal/line_mask_ThAr_H412.4nm_o14.fits |  Bin 0 -> 11520 bytes
 calib/cal/line_mask_ThAr_H429.7nm_o13.fits |  Bin 0 -> 11520 bytes
 calib/cal/line_mask_ThAr_H447.1nm_o12.fits |  Bin 0 -> 11520 bytes
 calib/cal/line_mask_ThAr_H447.1nm_o13.fits |  Bin 0 -> 11520 bytes
 calib/cal/line_mask_ThAr_H465.6nm_o12.fits |  Bin 0 -> 11520 bytes
 calib/cal/line_mask_ThAr_H484.5nm_o11.fits |  Bin 0 -> 11520 bytes
 calib/cal/line_mask_ThAr_H484.5nm_o12.fits |  Bin 0 -> 11520 bytes
 calib/cal/line_mask_ThAr_H504.8nm_o11.fits |  Bin 0 -> 11520 bytes
 calib/cal/line_mask_ThAr_H525.8nm_o10.fits |  Bin 0 -> 11520 bytes
 calib/cal/line_mask_ThAr_H525.8nm_o11.fits |  Bin 0 -> 11520 bytes
 calib/cal/line_mask_ThAr_H548.8nm_o10.fits |  Bin 0 -> 11520 bytes
 calib/cal/line_mask_ThAr_H572.8nm_o10.fits |  Bin 0 -> 11520 bytes
 calib/cal/line_mask_ThAr_H599.3nm_o9.fits  |  Bin 0 -> 11520 bytes
 calib/cal/line_mask_ThAr_H627.3nm_o9.fits  |  Bin 0 -> 11520 bytes
 calib/cal/line_mask_ThAr_H651.5nm_o8.fits  |  Bin 0 -> 8640 bytes
 calib/cal/line_mask_ThAr_H651.5nm_o9.fits  |  Bin 0 -> 8640 bytes
 calib/cal/line_mask_ThAr_H665.0nm_o8.fits  |  Bin 0 -> 8640 bytes
 calib/cal/line_mask_ThAr_H679.7nm_o8.fits  |  Bin 0 -> 8640 bytes
 calib/cal/line_mask_ThAr_H710.5nm_o8.fits  |  Bin 0 -> 8640 bytes
 calib/cal/line_mask_ThAr_H737.0nm_o7.fits  |  Bin 0 -> 8640 bytes
 calib/cal/line_mask_ThAr_H737.0nm_o8.fits  |  Bin 0 -> 8640 bytes
 calib/cal/line_mask_ThAr_H769.1nm_o7.fits  |  Bin 0 -> 8640 bytes
 calib/cal/line_mask_ThAr_H805.3nm_o6.fits  |  Bin 0 -> 8640 bytes
 calib/cal/line_mask_ThAr_H805.3nm_o7.fits  |  Bin 0 -> 8640 bytes
 calib/cal/line_mask_ThAr_H836.6nm_o6.fits  |  Bin 0 -> 8640 bytes
 calib/cal/line_mask_ThAr_H836.6nm_o7.fits  |  Bin 0 -> 8640 bytes
 calib/cal/line_mask_ThAr_H875.7nm_o6.fits  |  Bin 0 -> 8640 bytes
 calib/cal/line_mask_ThAr_H920.5nm_o5.fits  |  Bin 0 -> 8640 bytes
 calib/cal/line_mask_ThAr_H920.5nm_o6.fits  |  Bin 0 -> 8640 bytes
 calib/cal/line_mask_ThAr_L385.7nm_o5.fits  |  Bin 0 -> 14400 bytes
 calib/cal/line_mask_ThAr_L427.2nm_o4.fits  |  Bin 0 -> 17280 bytes
 calib/cal/line_mask_ThAr_L479.7nm_o4.fits  |  Bin 0 -> 14400 bytes
 calib/cal/line_mask_ThAr_L543.1nm_o3.fits  |  Bin 0 -> 14400 bytes
 calib/cal/line_mask_ThAr_L614.2nm_o3.fits  |  Bin 0 -> 14400 bytes
 calib/cal/line_mask_ThAr_L682.2nm_o3.fits  |  Bin 0 -> 11520 bytes
 calib/cal/line_mask_ThAr_L773.4nm_o2.fits  |  Bin 0 -> 11520 bytes
 calib/cal/line_mask_ThAr_L881.7nm_o2.fits  |  Bin 0 -> 11520 bytes
 calib/cal/slit_geometry_argus.fits         |  Bin 0 -> 20160 bytes
 calib/cal/slit_geometry_ifu1.fits          |  Bin 0 -> 20160 bytes
 calib/cal/slit_geometry_ifu2.fits          |  Bin 0 -> 20160 bytes
 calib/cal/slit_geometry_medusa1.fits       |  Bin 0 -> 14400 bytes
 calib/cal/slit_geometry_medusa2.fits       |  Bin 0 -> 14400 bytes
 49 files changed, 2891 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl-plugin-template.git