[cpl-plugin-kmos] 09/11: Merge branch 'upstream' into debian
Ole Streicher
olebole-guest at moszumanska.debian.org
Thu Dec 12 08:44:56 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-kmos.
commit dc986bf280936020f00dffdb4feca32bb2c92380
Merge: 8ef0809 56cf916
Author: Ole Streicher <debian at liska.ath.cx>
Date: Thu Dec 12 09:28:10 2013 +0100
Merge branch 'upstream' into debian
Conflicts:
html/dir_cf7033f5228c85e1a96cc09a6a6f109b.html
html/dirs.html
html/files.html
html/group__kmo__arithmetic.html
html/group__kmo__combine.html
html/group__kmo__copy.html
html/group__kmo__dark.html
html/group__kmo__dev__setup.html
html/group__kmo__extract__spec.html
html/group__kmo__fit__profile.html
html/group__kmo__fits__check.html
html/group__kmo__fits__stack.html
html/group__kmo__fits__strip.html
html/group__kmo__flat.html
html/group__kmo__illumination.html
html/group__kmo__make__image.html
html/group__kmo__multi__reconstruct.html
html/group__kmo__noise__map.html
html/group__kmo__reconstruct.html
html/group__kmo__rotate.html
html/group__kmo__sci__red.html
html/group__kmo__shift.html
html/group__kmo__sky__mask.html
html/group__kmo__sky__tweak.html
html/group__kmo__stats.html
html/group__kmo__std__star.html
html/group__kmo__wave__cal.html
html/index.html
html/kmo__arithmetic_8c_source.html
html/kmo__combine_8c_source.html
html/kmo__copy_8c_source.html
html/kmo__dark_8c_source.html
html/kmo__dev__setup_8c_source.html
html/kmo__extract__spec_8c_source.html
html/kmo__fit__profile_8c_source.html
html/kmo__fits__check_8c_source.html
html/kmo__fits__stack_8c_source.html
html/kmo__fits__strip_8c_source.html
html/kmo__flat_8c_source.html
html/kmo__illumination_8c_source.html
html/kmo__make__image_8c_source.html
html/kmo__multi__reconstruct_8c_source.html
html/kmo__noise__map_8c_source.html
html/kmo__reconstruct_8c_source.html
html/kmo__rotate_8c_source.html
html/kmo__sci__red_8c_source.html
html/kmo__shift_8c_source.html
html/kmo__sky__mask_8c_source.html
html/kmo__sky__tweak_8c_source.html
html/kmo__stats_8c_source.html
html/kmo__std__star_8c_source.html
html/kmo__wave__cal_8c_source.html
html/modules.html
html/yves__kmo__flat_8c_source.html
calib/cal/kmos_ar_ne_list_h.fits | Bin 8640 -> 0 bytes
calib/cal/kmos_ar_ne_list_hk.fits | Bin 8640 -> 0 bytes
calib/cal/kmos_ar_ne_list_iz.fits | Bin 8640 -> 0 bytes
calib/cal/kmos_ar_ne_list_k.fits | Bin 8640 -> 0 bytes
calib/cal/kmos_ar_ne_list_yj.fits | Bin 8640 -> 0 bytes
calib/cal/kmos_atmos_h.fits | Bin 31680 -> 0 bytes
calib/cal/kmos_atmos_hk.fits | Bin 31680 -> 0 bytes
calib/cal/kmos_atmos_iz.fits | Bin 40320 -> 0 bytes
calib/cal/kmos_atmos_k.fits | Bin 28800 -> 0 bytes
calib/cal/kmos_atmos_yj.fits | Bin 37440 -> 0 bytes
calib/cal/kmos_oh_spec_h.fits | Bin 195840 -> 0 bytes
calib/cal/kmos_oh_spec_hk.fits | Bin 385920 -> 0 bytes
calib/cal/kmos_oh_spec_iz.fits | Bin 167040 -> 0 bytes
calib/cal/kmos_oh_spec_k.fits | Bin 247680 -> 0 bytes
calib/cal/kmos_oh_spec_yj.fits | Bin 152640 -> 0 bytes
calib/cal/kmos_solar_h_2400.fits | Bin 46080 -> 0 bytes
calib/cal/kmos_solar_hk_1100.fits | Bin 54720 -> 0 bytes
calib/cal/kmos_solar_k_1700.fits | Bin 48960 -> 0 bytes
calib/cal/kmos_spec_type.fits | Bin 8640 -> 0 bytes
calib/cal/kmos_wave_band.fits | Bin 8640 -> 0 bytes
calib/cal/kmos_wave_ref_table.fits | Bin 8640 -> 0 bytes
calib/cal_size | 1 +
html/bc_s.png | Bin 677 -> 0 bytes
html/closed.png | Bin 126 -> 0 bytes
html/dir_cf7033f5228c85e1a96cc09a6a6f109b.html | 98 -
html/dirs.html | 66 -
html/doxygen.css | 949 ---------
html/doxygen.png | Bin 3942 -> 0 bytes
html/files.html | 96 -
html/group__kmo__arithmetic.html | 103 -
html/group__kmo__combine.html | 103 -
html/group__kmo__copy.html | 103 -
html/group__kmo__dark.html | 103 -
html/group__kmo__dev__setup.html | 103 -
html/group__kmo__extract__spec.html | 103 -
html/group__kmo__fit__profile.html | 103 -
html/group__kmo__fits__check.html | 64 -
html/group__kmo__fits__stack.html | 103 -
html/group__kmo__fits__strip.html | 103 -
html/group__kmo__flat.html | 103 -
html/group__kmo__illumination.html | 103 -
html/group__kmo__illumination__flat.html | 103 -
html/group__kmo__make__image.html | 104 -
html/group__kmo__multi__reconstruct.html | 104 -
html/group__kmo__noise__map.html | 103 -
html/group__kmo__reconstruct.html | 103 -
html/group__kmo__rotate.html | 103 -
html/group__kmo__sci__red.html | 103 -
html/group__kmo__shift.html | 103 -
html/group__kmo__sky__mask.html | 103 -
html/group__kmo__sky__tweak.html | 103 -
html/group__kmo__stats.html | 103 -
html/group__kmo__std__star.html | 103 -
html/group__kmo__wave__cal.html | 103 -
html/index.html | 63 -
html/kmo__arithmetic_8c_source.html | 1232 ------------
html/kmo__combine_8c_source.html | 1083 ----------
html/kmo__copy_8c_source.html | 1413 -------------
html/kmo__dark_8c_source.html | 885 --------
html/kmo__dev__setup_8c_source.html | 1268 ------------
html/kmo__extract__spec_8c_source.html | 823 --------
html/kmo__fit__profile_8c_source.html | 717 -------
html/kmo__fits__check_8c_source.html | 519 -----
html/kmo__fits__stack_8c_source.html | 399 ----
html/kmo__fits__strip_8c_source.html | 807 --------
html/kmo__flat_8c_source.html | 1741 ----------------
html/kmo__illumination_8c_source.html | 1871 -----------------
html/kmo__illumination__flat_8c_source.html | 1358 -------------
html/kmo__make__image_8c_source.html | 688 -------
html/kmo__multi__reconstruct_8c_source.html | 1547 --------------
html/kmo__noise__map_8c_source.html | 348 ----
html/kmo__reconstruct_8c_source.html | 1291 ------------
html/kmo__rotate_8c_source.html | 590 ------
html/kmo__sci__red_8c_source.html | 2558 ------------------------
html/kmo__shift_8c_source.html | 627 ------
html/kmo__sky__mask_8c_source.html | 486 -----
html/kmo__sky__tweak_8c_source.html | 401 ----
html/kmo__stats_8c_source.html | 969 ---------
html/kmo__std__star_8c_source.html | 2236 ---------------------
html/kmo__wave__cal_8c_source.html | 1330 ------------
html/modules.html | 90 -
html/nav_f.png | Bin 159 -> 0 bytes
html/nav_h.png | Bin 97 -> 0 bytes
html/open.png | Bin 118 -> 0 bytes
html/tab_a.png | Bin 140 -> 0 bytes
html/tab_b.png | Bin 178 -> 0 bytes
html/tab_h.png | Bin 192 -> 0 bytes
html/tab_s.png | Bin 189 -> 0 bytes
html/tabs.css | 59 -
html/yves__kmo__flat_8c_source.html | 1201 -----------
90 files changed, 1 insertion(+), 32347 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-kmos.git
More information about the debian-science-commits
mailing list