[Debian-astro-commits] [cpl] 01/02: Merge branch 'upstream' into debian
Ole Streicher
olebole at moszumanska.debian.org
Fri Feb 19 08:59:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository cpl.
commit 0314032e1669af3dc63411a2e9ba92b1817d94c8
Merge: 50beb3d a17e167
Author: Ole Streicher <ole at aip.de>
Date: Fri Feb 19 09:28:33 2016 +0100
Merge branch 'upstream' into debian
ChangeLog | 19 +++++++++++++++++++
configure | 20 ++++++++++----------
configure.ac | 2 +-
cplcore/cpl_image_basic.c | 10 ++++++++--
cplcore/cpl_mask.c | 6 ++++++
cplcore/cpl_mask_binary.h | 2 +-
cplcore/cpl_table.c | 14 +++++++-------
cplcore/tests/cpl_array-test.c | 16 +++++++++++++---
html/annotated.html | 2 +-
html/classes.html | 2 +-
html/deprecated.html | 2 +-
html/dir_0893a83ae506d6342ff4de074eaf5145.html | 2 +-
html/dir_283883d147ab9a845d7032d17e09a122.html | 2 +-
html/dir_5cd28bf58103222faf21a5533c3a1fe9.html | 2 +-
html/dir_d94ae846f16019cf15b4979bbb4258a2.html | 2 +-
html/functions.html | 2 +-
html/functions_vars.html | 2 +-
html/group__cpl__apertures.html | 2 +-
html/group__cpl__array.html | 2 +-
html/group__cpl__bivector.html | 2 +-
html/group__cpl__detector.html | 2 +-
html/group__cpl__dfs.html | 2 +-
html/group__cpl__error.html | 2 +-
html/group__cpl__errorstate.html | 2 +-
html/group__cpl__fft.html | 2 +-
html/group__cpl__filter.html | 2 +-
html/group__cpl__fit.html | 2 +-
html/group__cpl__fits.html | 2 +-
html/group__cpl__frame.html | 2 +-
html/group__cpl__framedata.html | 2 +-
html/group__cpl__frameset.html | 2 +-
html/group__cpl__frameset__io.html | 2 +-
html/group__cpl__frameset__iterator.html | 2 +-
html/group__cpl__geom__img.html | 2 +-
html/group__cpl__image.html | 2 +-
html/group__cpl__imagelist.html | 2 +-
html/group__cpl__init.html | 2 +-
html/group__cpl__io.html | 2 +-
html/group__cpl__mask.html | 2 +-
html/group__cpl__math.html | 2 +-
html/group__cpl__matrix.html | 2 +-
html/group__cpl__memory.html | 2 +-
html/group__cpl__msg.html | 2 +-
html/group__cpl__multiframe.html | 2 +-
html/group__cpl__parameter.html | 2 +-
html/group__cpl__parameterlist.html | 2 +-
html/group__cpl__photom.html | 2 +-
html/group__cpl__plot.html | 2 +-
html/group__cpl__plugin.html | 2 +-
html/group__cpl__pluginlist.html | 2 +-
html/group__cpl__polynomial.html | 2 +-
html/group__cpl__ppm.html | 2 +-
html/group__cpl__property.html | 2 +-
html/group__cpl__propertylist.html | 2 +-
html/group__cpl__recipe.html | 2 +-
html/group__cpl__recipeconfig.html | 2 +-
html/group__cpl__recipedefine.html | 2 +-
html/group__cpl__regex.html | 2 +-
html/group__cpl__stats.html | 2 +-
html/group__cpl__table.html | 16 ++++++++--------
html/group__cpl__test.html | 2 +-
html/group__cpl__type.html | 2 +-
html/group__cpl__vector.html | 2 +-
html/group__cpl__version.html | 2 +-
html/group__cpl__wcs.html | 2 +-
html/group__cpl__wlcalib.html | 2 +-
html/index.html | 2 +-
html/modules.html | 2 +-
html/pages.html | 2 +-
html/struct__cpl__framedata__-members.html | 2 +-
html/struct__cpl__framedata__.html | 2 +-
html/struct__cpl__plugin__-members.html | 2 +-
html/struct__cpl__plugin__.html | 2 +-
html/struct__cpl__recipe__-members.html | 2 +-
html/struct__cpl__recipe__.html | 2 +-
75 files changed, 139 insertions(+), 98 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl.git
More information about the Debian-astro-commits
mailing list