[cpl-plugin-giraf] 11/13: Merge branch 'upstream' into debian

Ole Streicher olebole-guest at moszumanska.debian.org
Tue Dec 3 21:17:35 UTC 2013


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

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

commit 6e29001ffc3aee291b878455152ec1c7a1044d9f
Merge: d2d3357 252ea24
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Dec 3 22:08:51 2013 +0100

    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 11520 -> 0 bytes
 calib/cal/line_mask_ThAr_H395.8nm_o14.fits |  Bin 8640 -> 0 bytes
 calib/cal/line_mask_ThAr_H412.4nm_o14.fits |  Bin 11520 -> 0 bytes
 calib/cal/line_mask_ThAr_H429.7nm_o13.fits |  Bin 11520 -> 0 bytes
 calib/cal/line_mask_ThAr_H447.1nm_o12.fits |  Bin 11520 -> 0 bytes
 calib/cal/line_mask_ThAr_H447.1nm_o13.fits |  Bin 11520 -> 0 bytes
 calib/cal/line_mask_ThAr_H465.6nm_o12.fits |  Bin 11520 -> 0 bytes
 calib/cal/line_mask_ThAr_H484.5nm_o11.fits |  Bin 11520 -> 0 bytes
 calib/cal/line_mask_ThAr_H484.5nm_o12.fits |  Bin 11520 -> 0 bytes
 calib/cal/line_mask_ThAr_H504.8nm_o11.fits |  Bin 11520 -> 0 bytes
 calib/cal/line_mask_ThAr_H525.8nm_o10.fits |  Bin 11520 -> 0 bytes
 calib/cal/line_mask_ThAr_H525.8nm_o11.fits |  Bin 11520 -> 0 bytes
 calib/cal/line_mask_ThAr_H548.8nm_o10.fits |  Bin 11520 -> 0 bytes
 calib/cal/line_mask_ThAr_H572.8nm_o10.fits |  Bin 11520 -> 0 bytes
 calib/cal/line_mask_ThAr_H599.3nm_o9.fits  |  Bin 11520 -> 0 bytes
 calib/cal/line_mask_ThAr_H627.3nm_o9.fits  |  Bin 11520 -> 0 bytes
 calib/cal/line_mask_ThAr_H651.5nm_o8.fits  |  Bin 8640 -> 0 bytes
 calib/cal/line_mask_ThAr_H651.5nm_o9.fits  |  Bin 8640 -> 0 bytes
 calib/cal/line_mask_ThAr_H665.0nm_o8.fits  |  Bin 8640 -> 0 bytes
 calib/cal/line_mask_ThAr_H679.7nm_o8.fits  |  Bin 8640 -> 0 bytes
 calib/cal/line_mask_ThAr_H710.5nm_o8.fits  |  Bin 8640 -> 0 bytes
 calib/cal/line_mask_ThAr_H737.0nm_o7.fits  |  Bin 8640 -> 0 bytes
 calib/cal/line_mask_ThAr_H737.0nm_o8.fits  |  Bin 8640 -> 0 bytes
 calib/cal/line_mask_ThAr_H769.1nm_o7.fits  |  Bin 8640 -> 0 bytes
 calib/cal/line_mask_ThAr_H805.3nm_o6.fits  |  Bin 8640 -> 0 bytes
 calib/cal/line_mask_ThAr_H805.3nm_o7.fits  |  Bin 8640 -> 0 bytes
 calib/cal/line_mask_ThAr_H836.6nm_o6.fits  |  Bin 8640 -> 0 bytes
 calib/cal/line_mask_ThAr_H836.6nm_o7.fits  |  Bin 8640 -> 0 bytes
 calib/cal/line_mask_ThAr_H875.7nm_o6.fits  |  Bin 8640 -> 0 bytes
 calib/cal/line_mask_ThAr_H920.5nm_o5.fits  |  Bin 8640 -> 0 bytes
 calib/cal/line_mask_ThAr_H920.5nm_o6.fits  |  Bin 8640 -> 0 bytes
 calib/cal/line_mask_ThAr_L385.7nm_o5.fits  |  Bin 14400 -> 0 bytes
 calib/cal/line_mask_ThAr_L427.2nm_o4.fits  |  Bin 17280 -> 0 bytes
 calib/cal/line_mask_ThAr_L479.7nm_o4.fits  |  Bin 14400 -> 0 bytes
 calib/cal/line_mask_ThAr_L543.1nm_o3.fits  |  Bin 14400 -> 0 bytes
 calib/cal/line_mask_ThAr_L614.2nm_o3.fits  |  Bin 14400 -> 0 bytes
 calib/cal/line_mask_ThAr_L682.2nm_o3.fits  |  Bin 11520 -> 0 bytes
 calib/cal/line_mask_ThAr_L773.4nm_o2.fits  |  Bin 11520 -> 0 bytes
 calib/cal/line_mask_ThAr_L881.7nm_o2.fits  |  Bin 11520 -> 0 bytes
 calib/cal/slit_geometry_argus.fits         |  Bin 20160 -> 0 bytes
 calib/cal/slit_geometry_ifu1.fits          |  Bin 20160 -> 0 bytes
 calib/cal/slit_geometry_ifu2.fits          |  Bin 20160 -> 0 bytes
 calib/cal/slit_geometry_medusa1.fits       |  Bin 14400 -> 0 bytes
 calib/cal/slit_geometry_medusa2.fits       |  Bin 14400 -> 0 bytes
 calib/cal_size                             |    1 +
 html/annotated.html                        |  114 -
 html/classes.html                          |   78 -
 html/doxygen.png                           |  Bin 1281 -> 0 bytes
 html/files.html                            |  186 -
 html/form_0.png                            |  Bin 957 -> 0 bytes
 html/form_1.png                            |  Bin 948 -> 0 bytes
 html/form_2.png                            |  Bin 663 -> 0 bytes
 html/form_3.png                            |  Bin 849 -> 0 bytes
 html/form_4.png                            |  Bin 1792 -> 0 bytes
 html/form_5.png                            |  Bin 2828 -> 0 bytes
 html/form_6.png                            |  Bin 725 -> 0 bytes
 html/form_7.png                            |  Bin 4078 -> 0 bytes
 html/form_8.png                            |  Bin 1935 -> 0 bytes
 html/formula.repository                    |    9 -
 html/functions.html                        |  114 -
 html/functions_0x62.html                   |  116 -
 html/functions_0x63.html                   |  123 -
 html/functions_0x64.html                   |  116 -
 html/functions_0x65.html                   |  121 -
 html/functions_0x66.html                   |  120 -
 html/functions_0x67.html                   |  115 -
 html/functions_0x68.html                   |  114 -
 html/functions_0x69.html                   |  118 -
 html/functions_0x6b.html                   |  114 -
 html/functions_0x6c.html                   |  139 -
 html/functions_0x6d.html                   |  125 -
 html/functions_0x6e.html                   |  124 -
 html/functions_0x6f.html                   |  122 -
 html/functions_0x70.html                   |  124 -
 html/functions_0x72.html                   |  129 -
 html/functions_0x73.html                   |  133 -
 html/functions_0x74.html                   |  119 -
 html/functions_0x76.html                   |  114 -
 html/functions_0x77.html                   |  120 -
 html/functions_0x78.html                   |  126 -
 html/functions_0x79.html                   |  119 -
 html/functions_0x7a.html                   |  113 -
 html/functions_vars.html                   |  114 -
 html/functions_vars_0x62.html              |  116 -
 html/functions_vars_0x63.html              |  123 -
 html/functions_vars_0x64.html              |  116 -
 html/functions_vars_0x65.html              |  121 -
 html/functions_vars_0x66.html              |  120 -
 html/functions_vars_0x67.html              |  115 -
 html/functions_vars_0x68.html              |  114 -
 html/functions_vars_0x69.html              |  118 -
 html/functions_vars_0x6b.html              |  114 -
 html/functions_vars_0x6c.html              |  139 -
 html/functions_vars_0x6d.html              |  125 -
 html/functions_vars_0x6e.html              |  124 -
 html/functions_vars_0x6f.html              |  122 -
 html/functions_vars_0x70.html              |  124 -
 html/functions_vars_0x72.html              |  129 -
 html/functions_vars_0x73.html              |  133 -
 html/functions_vars_0x74.html              |  119 -
 html/functions_vars_0x76.html              |  114 -
 html/functions_vars_0x77.html              |  120 -
 html/functions_vars_0x78.html              |  126 -
 html/functions_vars_0x79.html              |  119 -
 html/functions_vars_0x7a.html              |  113 -
 html/gialias_8h-source.html                |  544 ---
 html/giarray_8c-source.html                |  276 --
 html/giarray_8h-source.html                |  127 -
 html/giastrometry_8c-source.html           |  320 --
 html/giastrometry_8h-source.html           |  119 -
 html/giastroutils_8c-source.html           |  334 --
 html/giastroutils_8h-source.html           |  117 -
 html/gibias_8c-source.html                 | 3632 -------------------
 html/gibias_8h-source.html                 |  200 --
 html/gichebyshev_8c-source.html            |  384 ---
 html/gichebyshev_8h-source.html            |  142 -
 html/giclip_8h-source.html                 |  131 -
 html/gicube_8c-source.html                 | 1160 -------
 html/gicube_8h-source.html                 |  168 -
 html/gidark_8c-source.html                 |  826 -----
 html/gidark_8h-source.html                 |  145 -
 html/gidebug_8h-source.html                |  125 -
 html/gierror_8c-source.html                |  182 -
 html/gierror_8h-source.html                |  123 -
 html/giextract_8c-source.html              | 3642 --------------------
 html/giextract_8h-source.html              |  176 -
 html/giextraction_8c-source.html           |  216 --
 html/giextraction_8h-source.html           |  134 -
 html/gifibers_8c-source.html               |  415 ---
 html/gifibers_8h-source.html               |  153 -
 html/gifiberutils_8c-source.html           | 1426 --------
 html/gifiberutils_8h-source.html           |  162 -
 html/giflat_8c-source.html                 |  427 ---
 html/giflat_8h-source.html                 |  145 -
 html/gifov_8c-source.html                  | 2047 -----------
 html/gifov_8h-source.html                  |  200 --
 html/giframe_8c-source.html                |  710 ----
 html/giframe_8h-source.html                |  271 --
 html/giframestack_8c-source.html           |  639 ----
 html/gifxcalibration_8c-source.html        | 1895 ----------
 html/gifxcalibration_8h-source.html        |  148 -
 html/gigrating_8c-source.html              |  759 ----
 html/gigrating_8h-source.html              |  155 -
 html/giimage_8c-source.html                |  644 ----
 html/giimage_8h-source.html                |  159 -
 html/giimagestack_8c-source.html           |  254 --
 html/giimagestack_8h-source.html           |  135 -
 html/gilevenberg_8c-source.html            |  618 ----
 html/gilevenberg_8h-source.html            |  142 -
 html/gilinedata_8c-source.html             | 1135 ------
 html/gilinedata_8h-source.html             |  170 -
 html/gilocalization_8c-source.html         |  206 --
 html/gilocalization_8h-source.html         |  135 -
 html/gilocalize_8c-source.html             | 3489 -------------------
 html/gilocalize_8h-source.html             |  161 -
 html/gimacros_8h-source.html               |  152 -
 html/gimask_8h-source.html                 |  154 -
 html/gimasterbias_8c-source.html           | 1995 -----------
 html/gimasterdark_8c-source.html           | 1009 ------
 html/gimasterflat_8c-source.html           | 3263 ------------------
 html/gimath_8c-source.html                 |  824 -----
 html/gimath_8h-source.html                 |  159 -
 html/gimath__lm_8c-source.html             | 1678 ---------
 html/gimath__lm_8h-source.html             |  265 --
 html/gimatrix_8c-source.html               |  816 -----
 html/gimatrix_8h-source.html               |  148 -
 html/gimessages_8c-source.html             |  155 -
 html/gimessages_8h-source.html             |  147 -
 html/gimodel_8c-source.html                | 1122 ------
 html/gimodel_8h-source.html                |  204 --
 html/gimodels_8c-source.html               | 1923 -----------
 html/gimodels_8h-source.html               |  177 -
 html/gipaf_8c-source.html                  |  922 -----
 html/gipaf_8h-source.html                  |  142 -
 html/gipsf_8c-source.html                  | 3468 -------------------
 html/gipsf_8h-source.html                  |  154 -
 html/gipsfdata_8c-source.html              | 1012 ------
 html/gipsfdata_8h-source.html              |  165 -
 html/giqclog_8c-source.html                |  156 -
 html/giqclog_8h-source.html                |  122 -
 html/giraffe.css                           |  232 --
 html/girange_8c-source.html                |  207 --
 html/girange_8h-source.html                |  130 -
 html/girebinning_8c-source.html            | 4548 ------------------------
 html/girebinning_8h-source.html            |  243 --
 html/giresponse_8c-source.html             |  148 -
 html/giresponse_8h-source.html             |  127 -
 html/girvcorrection_8c-source.html         | 1245 -------
 html/girvcorrection_8h-source.html         |  130 -
 html/giscience_8c-source.html              | 2314 -------------
 html/gisgcalibration_8c-source.html        | 2795 ---------------
 html/gisgcalibration_8h-source.html        |  173 -
 html/gislight_8c-source.html               | 1723 ----------
 html/gislight_8h-source.html               |  146 -
 html/gislitgeometry_8c-source.html         |  783 -----
 html/gislitgeometry_8h-source.html         |  156 -
 html/gistacking_8c-source.html             |  796 -----
 html/gistacking_8h-source.html             |  156 -
 html/gistandard_8c-source.html             | 2627 --------------
 html/gisutils_8c-source.html               |  265 --
 html/gisutils_8h-source.html               |  121 -
 html/gitable_8c-source.html                |  666 ----
 html/gitable_8h-source.html                |  171 -
 html/gitransmission_8c-source.html         |  682 ----
 html/gitransmission_8h-source.html         |  160 -
 html/giutils_8c-source.html                | 1197 -------
 html/giutils_8h-source.html                |  242 --
 html/giwavecalib__types_8c-source.html     |  437 ---
 html/giwavecalib__types_8h-source.html     |  237 --
 html/giwavecalibration_8c-source.html      | 2540 --------------
 html/giwindow_8h-source.html               |  123 -
 html/giwlcalibration_8c-source.html        | 5165 ----------------------------
 html/giwlcalibration_8h-source.html        |  237 --
 html/giwlresiduals_8c-source.html          |  694 ----
 html/giwlresiduals_8h-source.html          |  142 -
 html/giwlsolution_8c-source.html           |  847 -----
 html/giwlsolution_8h-source.html           |  156 -
 html/group__giarray.html                   |  128 -
 html/group__giastrometry.html              |  126 -
 html/group__giastroutils.html              |  144 -
 html/group__gibias.html                    |  346 --
 html/group__gicube.html                    | 1123 ------
 html/group__gidark.html                    |  145 -
 html/group__gierror.html                   |   90 -
 html/group__giextract.html                 |  288 --
 html/group__gifibers.html                  |  281 --
 html/group__gifiberutils.html              |  588 ----
 html/group__giflat.html                    |  245 --
 html/group__gifov.html                     |  476 ---
 html/group__giframe.html                   |  495 ---
 html/group__gifxcalibration.html           |  233 --
 html/group__gigrating.html                 |  284 --
 html/group__giimage.html                   |  795 -----
 html/group__giimagestack.html              |  327 --
 html/group__gilevenberg.html               |  196 --
 html/group__gilocalize.html                |  265 --
 html/group__gimath__lm.html                |   80 -
 html/group__gimatrix.html                  |  427 ---
 html/group__gimessages.html                |  263 --
 html/group__gimodel.html                   |  177 -
 html/group__gipaf.html                     |  121 -
 html/group__gipsf.html                     |  263 --
 html/group__giqclog.html                   |   84 -
 html/group__girange.html                   |  347 --
 html/group__girebinning.html               |  518 ---
 html/group__giresponse.html                |   76 -
 html/group__girvcorrection.html            |  179 -
 html/group__gisgcalibration.html           |  271 --
 html/group__gislight.html                  |  262 --
 html/group__gislitgeometry.html            |  508 ---
 html/group__gistacking.html                |  436 ---
 html/group__gisutils.html                  |   81 -
 html/group__gitable.html                   |  718 ----
 html/group__gitransmission.html            |  233 --
 html/group__giutils.html                   |  454 ---
 html/group__giwavecalib.html               |  213 --
 html/group__giwlcalibration.html           |  314 --
 html/group__giwlresiduals.html             |  112 -
 html/group__giwlsolution.html              |  204 --
 html/index.html                            |   78 -
 html/modules.html                          |  117 -
 html/structGiBiasConfig.html               |  123 -
 html/structGiClipParams.html               |   93 -
 html/structGiDarkConfig.html               |   90 -
 html/structGiDarkResults.html              |   96 -
 html/structGiExtractConfig.html            |  114 -
 html/structGiExtraction.html               |   99 -
 html/structGiFibersConfig.html             |   90 -
 html/structGiFieldOfView.html              |  108 -
 html/structGiFieldOfViewConfig.html        |   96 -
 html/structGiFitParams.html                |  153 -
 html/structGiFitSetup.html                 |   93 -
 html/structGiFlatConfig.html               |   93 -
 html/structGiFxCalibrationConfig.html      |   87 -
 html/structGiGrating.html                  |  449 ---
 html/structGiGroupInfo.html                |   90 -
 html/structGiImageStack.html               |  134 -
 html/structGiLocalization.html             |   96 -
 html/structGiLocalizeConfig.html           |  132 -
 html/structGiMaskParameters.html           |  132 -
 html/structGiMaskPosition.html             |   93 -
 html/structGiModel.html                    |  135 -
 html/structGiModelData.html                |   93 -
 html/structGiPsfConfig.html                |  117 -
 html/structGiRebinConfig.html              |  102 -
 html/structGiRebinParams.html              |  180 -
 html/structGiRebinning.html                |   90 -
 html/structGiRecipeInfo.html               |   93 -
 html/structGiResponse.html                 |   90 -
 html/structGiRvCorrection.html             |   93 -
 html/structGiSGCalConfig.html              |  307 --
 html/structGiSLightConfig.html             |  114 -
 html/structGiSlitGeometry.html             |  146 -
 html/structGiStackingConfig.html           |  102 -
 html/structGiTransmissionConfig.html       |   87 -
 html/structGiWCalConfig.html               |  891 -----
 html/structGiWCalData.html                 |   93 -
 html/structGiWindow.html                   |   96 -
 html/structlmrq__model.html                |  206 --
 html/structlmrq__params.html               |  142 -
 html/tab_b.gif                             |  Bin 35 -> 0 bytes
 html/tab_l.gif                             |  Bin 706 -> 0 bytes
 html/tab_r.gif                             |  Bin 2585 -> 0 bytes
 html/tabs.css                              |  102 -
 309 files changed, 1 insertion(+), 110801 deletions(-)

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



More information about the debian-science-commits mailing list