[cpl-plugin-sinfo] 01/04: 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 df5572b856b9e15ad505d97da94cfe4797ec703e
Merge: 3747aac 9f5ddf1
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Dec 3 13:47:55 2013 +0100

    Merge branch 'upstream' into debian
    
    Conflicts:
    	calib/cal/REF_BP_MAP.fits
    	calib/cal/SI_GATM_REF_CORR_HK_025.fits
    	calib/cal/SI_GATM_REF_CORR_HK_100.fits
    	calib/cal/SI_GATM_REF_CORR_H_025.fits
    	calib/cal/SI_GATM_REF_CORR_H_100.fits
    	calib/cal/SI_GATM_REF_CORR_J_025.fits
    	calib/cal/SI_GATM_REF_CORR_J_100.fits
    	calib/cal/SI_GATM_REF_CORR_K_025.fits
    	calib/cal/SI_GATM_REF_CORR_K_100.fits
    	calib/cal/argonJ.fits
    	calib/cal/atmoexan.fits
    	calib/cal/drs_setup_wave.fits
    	calib/cal/drs_setup_wave_oh.fits
    	calib/cal/neonK.fits
    	calib/cal/xenonHK.fits
    	calib/cal/xenonargonH.fits

 calib/cal/REF_BP_MAP.fits              |   1 -
 calib/cal/SI_GATM_REF_CORR_HK_025.fits |   2 --
 calib/cal/SI_GATM_REF_CORR_HK_100.fits |   2 --
 calib/cal/SI_GATM_REF_CORR_H_025.fits  |   1 -
 calib/cal/SI_GATM_REF_CORR_H_100.fits  |   1 -
 calib/cal/SI_GATM_REF_CORR_J_025.fits  |   2 --
 calib/cal/SI_GATM_REF_CORR_J_100.fits  |   1 -
 calib/cal/SI_GATM_REF_CORR_K_025.fits  |   1 -
 calib/cal/SI_GATM_REF_CORR_K_100.fits  |   1 -
 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                  |   1 -
 calib/cal/atmoexan.fits                |  15 ---------------
 calib/cal/drs_setup_wave.fits          | Bin 20160 -> 0 bytes
 calib/cal/drs_setup_wave_oh.fits       | Bin 20160 -> 0 bytes
 calib/cal/neonK.fits                   |   3 ---
 calib/cal/xenonHK.fits                 | Bin 8640 -> 0 bytes
 calib/cal/xenonargonH.fits             | Bin 14400 -> 0 bytes
 calib/cal_size                         |   1 +
 33 files changed, 1 insertion(+), 79 deletions(-)

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