[cpl-plugin-xsh] 15/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 417f43e6fc699cc040159e55eb46613eecd0d215
Merge: 92e4512 ba7798b
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed May 8 14:18:30 2013 +0200

    Merge branch 'upstream' into debian

 {cal => calib}/dic/ESO-DFS-DIC.XSHOO_QC   |    0
 {cal => calib}/dic/ESO-VLT-DIC.XSHOO_CFG  |    0
 {cal => calib}/dic/ESO-VLT-DIC.XSHOO_DCS  |    0
 {cal => calib}/dic/ESO-VLT-DIC.XSHOO_ICS  |    0
 {cal => calib}/dic/ESO-VLT-DIC.XSHOO_OS   |    0
 {cal => calib}/gasgano/config/SHOOT.rul   |  Bin 54740 -> 54740 bytes
 {cal => calib}/gasgano/config/XSH.rul     |  Bin 49754 -> 49754 bytes
 {cal => calib}/gasgano/config/XSHOO.prefs |    0
 {cal => calib}/gasgano/config/xsh.oca     |    0
 {cal => calib}/gasgano/config/xsh_wkf.oca |    0
 10 files changed, 0 insertions(+), 0 deletions(-)

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