[cpl-plugin-sinfo] 39/42: Merge branch 'upstream' into debian

[Ole Streicher]

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

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

commit 4abfc5a32164e1dbdfb829f7aac373f82c725781
Merge: 2d95726 5f63f3d
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Sep 16 10:22:09 2013 +0200

    Merge branch 'upstream' into debian

 calib/cal/REF_BP_MAP.fits              |    1 +
 calib/cal/SI_GATM_REF_CORR_HK_025.fits |  Bin 0 -> 8640 bytes
 calib/cal/SI_GATM_REF_CORR_HK_100.fits |  Bin 0 -> 8640 bytes
 calib/cal/SI_GATM_REF_CORR_H_025.fits  |  Bin 0 -> 8640 bytes
 calib/cal/SI_GATM_REF_CORR_H_100.fits  |  Bin 0 -> 8640 bytes
 calib/cal/SI_GATM_REF_CORR_J_025.fits  |  Bin 0 -> 8640 bytes
 calib/cal/SI_GATM_REF_CORR_J_100.fits  |  Bin 0 -> 8640 bytes
 calib/cal/SI_GATM_REF_CORR_K_025.fits  |  Bin 0 -> 8640 bytes
 calib/cal/SI_GATM_REF_CORR_K_100.fits  |  Bin 0 -> 8640 bytes
 calib/cal/SLIT_POS_HK_025.fits         |    1 +
 calib/cal/SLIT_POS_HK_100.fits         |    1 +
 calib/cal/SLIT_POS_HK_250.fits         |    1 +
 calib/cal/SLIT_POS_HK_PUPIL.fits       |    1 +
 calib/cal/SLIT_POS_H_025.fits          |    1 +
 calib/cal/SLIT_POS_H_100.fits          |    3 +++
 calib/cal/SLIT_POS_H_250.fits          |    2 ++
 calib/cal/SLIT_POS_H_PUPIL.fits        |    3 +++
 calib/cal/SLIT_POS_J_025.fits          |    4 ++++
 calib/cal/SLIT_POS_J_100.fits          |    5 +++++
 calib/cal/SLIT_POS_J_250.fits          |    4 ++++
 calib/cal/SLIT_POS_J_PUPIL.fits        |    5 +++++
 calib/cal/SLIT_POS_K_025.fits          |    3 +++
 calib/cal/SLIT_POS_K_100.fits          |    5 +++++
 calib/cal/SLIT_POS_K_250.fits          |    4 ++++
 calib/cal/SLIT_POS_K_PUPIL.fits        |    5 +++++
 calib/cal/argonJ.fits                  |  Bin 0 -> 8641 bytes
 calib/cal/atmoexan.fits                |   15 +++++++++++++++
 calib/cal/drs_setup_wave.fits          |  Bin 0 -> 20160 bytes
 calib/cal/drs_setup_wave_oh.fits       |  Bin 0 -> 20160 bytes
 calib/cal/neonK.fits                   |  Bin 0 -> 8641 bytes
 calib/cal/xenonHK.fits                 |  Bin 0 -> 8640 bytes
 calib/cal/xenonargonH.fits             |  Bin 0 -> 14400 bytes
 32 files changed, 64 insertions(+)

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