[starlink-ast] 02/03: Merge branch 'upstream+dfsg' into debian
Ole Streicher
olebole-guest at alioth.debian.org
Wed Sep 25 12:47:26 UTC 2013
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository starlink-ast.
commit 574107b67752bf7275c248470e166db0cfad2ae1
Merge: 9acdb02 7324860
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Sep 25 14:22:31 2013 +0200
Merge branch 'upstream+dfsg' into debian
Makefile.am | 50 +-
Makefile.in | 50 +-
aclocal.m4 | 8 +-
ast.news | 22 +-
box.c | 120 +-
configure | 26 +-
configure.ac | 4 +-
fitschan.c | 175 +-
keymap.c | 134 +-
keymap.h | 9 +-
mapping.c | 23 +-
object.c | 20 +-
region.c | 81 +-
skyframe.c | 67 +-
skyframe.h | 4 -
sun210.tex | 142 +-
sun210_figures/cmpframe.eps | 931 --
sun210_figures/cmpframe.pdf | Bin 0 -> 7432 bytes
sun210_figures/complex.eps | 1572 ---
sun210_figures/complex.pdf | Bin 0 -> 15323 bytes
sun210_figures/frames.eps | 1095 --
sun210_figures/frames.pdf | Bin 0 -> 7196 bytes
sun210_figures/frameset.eps | 2990 ------
sun210_figures/frameset.pdf | Bin 0 -> 28443 bytes
sun210_figures/fronta.eps | 6473 ------------
sun210_figures/fronta.pdf | Bin 0 -> 22646 bytes
sun210_figures/fronta_bw.eps | 6472 ------------
sun210_figures/fronta_bw.pdf | Bin 0 -> 22635 bytes
sun210_figures/frontb.eps |21511 ----------------------------------------
sun210_figures/frontb.pdf | Bin 0 -> 66281 bytes
sun210_figures/frontb_bw.eps |21509 ---------------------------------------
sun210_figures/frontb_bw.pdf | Bin 0 -> 66247 bytes
sun210_figures/frontc.eps |14114 --------------------------
sun210_figures/frontc.pdf | Bin 0 -> 43197 bytes
sun210_figures/frontc_bw.eps |14113 --------------------------
sun210_figures/frontc_bw.pdf | Bin 0 -> 43186 bytes
sun210_figures/fsalign.eps | 5444 ----------
sun210_figures/fsalign.pdf | Bin 0 -> 51413 bytes
sun210_figures/fsconvert.eps | 1748 ----
sun210_figures/fsconvert.pdf | Bin 0 -> 18693 bytes
sun210_figures/fsexample.eps | 1786 ----
sun210_figures/fsexample.pdf | Bin 0 -> 17716 bytes
sun210_figures/fsmerge.eps | 5238 ----------
sun210_figures/fsmerge.pdf | Bin 0 -> 47115 bytes
sun210_figures/fsremap.eps | 2532 -----
sun210_figures/fsremap.pdf | Bin 0 -> 24970 bytes
sun210_figures/gridplot.eps |16726 -------------------------------
sun210_figures/gridplot.pdf | Bin 0 -> 50536 bytes
sun210_figures/gridplot_bw.eps |16724 -------------------------------
sun210_figures/gridplot_bw.pdf | Bin 0 -> 50506 bytes
sun210_figures/mapping.eps | 1003 --
sun210_figures/mapping.pdf | Bin 0 -> 8013 bytes
sun210_figures/overgrid.eps | 6080 ------------
sun210_figures/overgrid.pdf | Bin 0 -> 26963 bytes
sun210_figures/overgrid_bw.eps | 6001 -----------
sun210_figures/overgrid_bw.pdf | Bin 0 -> 25865 bytes
sun210_figures/parallel.eps | 988 --
sun210_figures/parallel.pdf | Bin 0 -> 10441 bytes
sun210_figures/series.eps | 970 --
sun210_figures/series.pdf | Bin 0 -> 10149 bytes
sun210_figures/simpexamp.eps | 1197 ---
sun210_figures/simpexamp.pdf | Bin 0 -> 7842 bytes
sun211.tex | 142 +-
sun211_figures/cmpframe.eps | 931 --
sun211_figures/cmpframe.pdf | Bin 0 -> 7432 bytes
sun211_figures/complex.eps | 1572 ---
sun211_figures/complex.pdf | Bin 0 -> 15323 bytes
sun211_figures/frames.eps | 1095 --
sun211_figures/frames.pdf | Bin 0 -> 7196 bytes
sun211_figures/frameset.eps | 2990 ------
sun211_figures/frameset.pdf | Bin 0 -> 28443 bytes
sun211_figures/fronta.eps | 6473 ------------
sun211_figures/fronta.pdf | Bin 0 -> 22646 bytes
sun211_figures/fronta_bw.eps | 6472 ------------
sun211_figures/fronta_bw.pdf | Bin 0 -> 22635 bytes
sun211_figures/frontb.eps |21511 ----------------------------------------
sun211_figures/frontb.pdf | Bin 0 -> 66281 bytes
sun211_figures/frontb_bw.eps |21509 ---------------------------------------
sun211_figures/frontb_bw.pdf | Bin 0 -> 66247 bytes
sun211_figures/frontc.eps |14114 --------------------------
sun211_figures/frontc.pdf | Bin 0 -> 43197 bytes
sun211_figures/frontc_bw.eps |14113 --------------------------
sun211_figures/frontc_bw.pdf | Bin 0 -> 43186 bytes
sun211_figures/fsalign.eps | 5444 ----------
sun211_figures/fsalign.pdf | Bin 0 -> 51413 bytes
sun211_figures/fsconvert.eps | 1748 ----
sun211_figures/fsconvert.pdf | Bin 0 -> 18693 bytes
sun211_figures/fsexample.eps | 1786 ----
sun211_figures/fsexample.pdf | Bin 0 -> 17716 bytes
sun211_figures/fsmerge.eps | 5238 ----------
sun211_figures/fsmerge.pdf | Bin 0 -> 47115 bytes
sun211_figures/fsremap.eps | 2532 -----
sun211_figures/fsremap.pdf | Bin 0 -> 24962 bytes
sun211_figures/gridplot.eps |16726 -------------------------------
sun211_figures/gridplot.pdf | Bin 0 -> 50536 bytes
sun211_figures/gridplot_bw.eps |16724 -------------------------------
sun211_figures/gridplot_bw.pdf | Bin 0 -> 50506 bytes
sun211_figures/mapping.eps | 1003 --
sun211_figures/mapping.pdf | Bin 0 -> 8013 bytes
sun211_figures/overgrid.eps | 6080 ------------
sun211_figures/overgrid.pdf | Bin 0 -> 26963 bytes
sun211_figures/overgrid_bw.eps | 6001 -----------
sun211_figures/overgrid_bw.pdf | Bin 0 -> 25865 bytes
sun211_figures/parallel.eps | 988 --
sun211_figures/parallel.pdf | Bin 0 -> 10441 bytes
sun211_figures/series.eps | 970 --
sun211_figures/series.pdf | Bin 0 -> 10149 bytes
sun211_figures/simpexamp.eps | 1197 ---
sun211_figures/simpexamp.pdf | Bin 0 -> 7842 bytes
version.h | 6 +-
110 files changed, 652 insertions(+), 314865 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/starlink-ast.git
More information about the debian-science-commits
mailing list