[cpl-plugin-xsh] 09/33: 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-xsh.

commit 8d432b0accd49bb7f5cd43a0353a104e77de9178
Merge: 25ff2d4 6b7694a
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Apr 25 11:17:49 2013 +0200

    Merge branch 'upstream' into debian

 calib/cal/ARC_LINE_LIST_AFC_NIR.fits             |    2 -
 calib/cal/ARC_LINE_LIST_AFC_UVB.fits             |    1 -
 calib/cal/ARC_LINE_LIST_AFC_VIS.fits             |    1 -
 calib/cal/ARC_LINE_LIST_INTMON_NIR.fits          |  Bin 8640 -> 0 bytes
 calib/cal/ARC_LINE_LIST_INTMON_UVB.fits          |  Bin 8640 -> 0 bytes
 calib/cal/ARC_LINE_LIST_INTMON_VIS.fits          |  Bin 8640 -> 0 bytes
 calib/cal/BP_MAP_RP_NIR.fits                     |    1 -
 calib/cal/BP_MAP_RP_UVB_1x1.fits                 |    1 -
 calib/cal/BP_MAP_RP_UVB_1x2.fits                 |    1 -
 calib/cal/BP_MAP_RP_UVB_2x2.fits                 |    1 -
 calib/cal/BP_MAP_RP_VIS_1x1.fits                 |    1 -
 calib/cal/BP_MAP_RP_VIS_1x2.fits                 |    1 -
 calib/cal/BP_MAP_RP_VIS_2x2.fits                 |    1 -
 calib/cal/IFU_CFG_TAB_NIR.fits                   |    4 -
 calib/cal/IFU_CFG_TAB_UVB.fits                   |    4 -
 calib/cal/IFU_CFG_TAB_VIS.fits                   |    4 -
 calib/cal/SINGLE_FRAME_SKY_SUB_BKPTS_NIR.fits    |    1 -
 calib/cal/SINGLE_FRAME_SKY_SUB_BKPTS_UVB.fits    |    1 -
 calib/cal/SINGLE_FRAME_SKY_SUB_BKPTS_VIS.fits    |    1 -
 calib/cal/SKY_LINE_LIST_NIR.fits                 |   38 -
 calib/cal/SKY_LINE_LIST_UVB.fits                 |   18 -
 calib/cal/SKY_LINE_LIST_VIS.fits                 |   47 -
 calib/cal/SPECTRAL_FORMAT_TAB_JH_NIR.fits        |    2 -
 calib/cal/SPECTRAL_FORMAT_TAB_NIR.fits           |    2 -
 calib/cal/SPECTRAL_FORMAT_TAB_UVB.fits           |    1 -
 calib/cal/SPECTRAL_FORMAT_TAB_VIS.fits           |    4 -
 calib/cal/ThAr_uvb_2012PBR.fits                  |    7 -
 calib/cal/ThAr_vis_custom.fits                   |    6 -
 calib/cal/XS_GMCT_090502A_UVB.fits               |    4 -
 calib/cal/XS_GMCT_090502A_VIS.fits               |    4 -
 calib/cal/XS_GMCT_090507A_NIR.fits               |   16 -
 calib/cal/XS_GMCT_091006A_NIR.fits               |    4 -
 calib/cal/XS_GMCT_091006A_UVB.fits               |    7 -
 calib/cal/XS_GMCT_091006A_VIS.fits               |    4 -
 calib/cal/XS_GMCT_100331A_NIR.fits               |    4 -
 calib/cal/XS_GMCT_100331A_UVB.fits               |    7 -
 calib/cal/XS_GMCT_100331A_VIS.fits               |    4 -
 calib/cal/XS_GMCT_100822A_NIR.fits               |   10 -
 calib/cal/XS_GMCT_100822A_UVB.fits               |    7 -
 calib/cal/XS_GMCT_100822A_VIS.fits               |   10 -
 calib/cal/XS_GMCT_110710A_NIR.fits               |    7 -
 calib/cal/XS_GMCT_110710A_UVB.fits               |    7 -
 calib/cal/XS_GMCT_110710A_VIS.fits               |   13 -
 calib/cal/paranalextinct.dat                     |   78 -
 calib/cal/penray_nir_custom_air_ext_2012PBR.fits |    5 -
 calib/cal/shoot_paranal_extinct_nir.fits         |    3 -
 calib/cal/shoot_paranal_extinct_uvb.fits         |    3 -
 calib/cal/shoot_paranal_extinct_vis.fits         |    3 -
 calib/cal/telluric_model_catalog_nir.fits        |1077588 ----------------------
 calib/cal/xsh_high_abs_window_nir.fits           |    1 -
 calib/cal/xsh_high_abs_window_uvb.fits           |    1 -
 calib/cal/xsh_high_abs_window_vis.fits           |    1 -
 calib/cal/xsh_paranal_extinct_nir.fits           |    3 -
 calib/cal/xsh_paranal_extinct_uvb.fits           |    3 -
 calib/cal/xsh_paranal_extinct_vis.fits           |    3 -
 calib/cal/xsh_star_catalog_air_nir.fits          |  Bin 4008960 -> 0 bytes
 calib/cal/xsh_star_catalog_air_uvb.fits          |  Bin 4008960 -> 0 bytes
 calib/cal/xsh_star_catalog_air_vis.fits          |  Bin 4008960 -> 0 bytes
 calib/dic/ESO-DFS-DIC.XSHOO_QC                   | 1882 -
 calib/dic/ESO-VLT-DIC.XSHOO_CFG                  | 1117 -
 calib/dic/ESO-VLT-DIC.XSHOO_DCS                  |   66 -
 calib/dic/ESO-VLT-DIC.XSHOO_ICS                  | 2502 -
 calib/dic/ESO-VLT-DIC.XSHOO_OS                   |  291 -
 calib/gasgano/config/SHOOT.rul                   |  Bin 54740 -> 0 bytes
 calib/gasgano/config/XSH.rul                     |  Bin 49754 -> 0 bytes
 calib/gasgano/config/XSHOO.prefs                 |   53 -
 calib/gasgano/config/xsh.oca                     | 4682 -
 calib/gasgano/config/xsh_wkf.oca                 | 3451 -
 68 files changed, 1091995 deletions(-)

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