[cpl-plugin-hawki] 21/39: 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-hawki.

commit 9010290dce9f74a34868e03cba7f59b7553716f1
Merge: f734f1f 5edc53c
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Apr 25 11:40:02 2013 +0200

    Merge branch 'upstream' into debian

 calib/cal/HI_GSSC_081103A_stdstars_cat.fits |  Bin 17280 -> 0 bytes
 calib/cal/distmap.fits                      |  Bin 25920 -> 0 bytes
 calib/cal/distmap_x.fits                    |  Bin 25920 -> 0 bytes
 calib/cal/distmap_y.fits                    |  Bin 25920 -> 0 bytes
 calib/cal/master_2mass_tbl.fits             |  Bin 17280 -> 0 bytes
 calib/dic/ESO-DFS-DIC.HAWKI_QC              |  948 ------------------------
 calib/dic/ESO-VLT-DIC.HAWKI_CFG             |  929 -----------------------
 calib/dic/ESO-VLT-DIC.HAWKI_ICS             | 1057 ---------------------------
 calib/dic/ESO-VLT-DIC.HAWKI_OS              |  409 -----------
 calib/gasgano/config/HAWKI.prefs            |   53 --
 calib/gasgano/config/HAWKI.prefs.in         |   53 --
 calib/gasgano/config/hawki.oca              |  375 ----------
 calib/gasgano/config/hawki_wkf.oca          |  264 -------
 13 files changed, 4088 deletions(-)

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