[cpl] 01/02: Merge branch 'upstream' into debian

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository cpl.

commit 6ef80e5e393f0e6004c91fd8362fe1e11fb1ef59
Merge: e9e1e2d bf14108
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sat Sep 27 22:39:19 2014 +0200

    Merge branch 'upstream' into debian

 NEWS                                           |   12 +
 configure                                      |   36 +-
 configure.ac                                   |    4 +-
 cpl.h                                          |    2 +
 cplcore/cpl_stats_body.h                       |    4 +-
 cplcore/cpl_tools_body.h                       |    2 +-
 cpldfs/Makefile.am                             |    4 +-
 cpldfs/Makefile.in                             |    7 +-
 cpldfs/cpl_dfs.c                               |  470 ++-
 cpldfs/cpl_dfs.h                               |   38 +
 cpldfs/cpl_multiframe.c                        | 5066 ++++++++++++++++++++++++
 cpldfs/cpl_multiframe.h                        |  205 +
 cpldfs/tests/cpl_dfs-test.c                    |   22 +-
 cpldrs/cpl_wlcalib.c                           |    5 +-
 html/annotated.html                            |    2 +-
 html/classes.html                              |    2 +-
 html/deprecated.html                           |    2 +-
 html/dir_0893a83ae506d6342ff4de074eaf5145.html |    6 +-
 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                      |  104 +-
 html/group__cpl__error.html                    |    8 +-
 html/group__cpl__errorstate.html               |    6 +-
 html/group__cpl__fft.html                      |    2 +-
 html/group__cpl__filter.html                   |    2 +-
 html/group__cpl__fit.html                      |    2 +-
 html/group__cpl__fits.html                     |    4 +-
 html/group__cpl__frame.html                    |    6 +-
 html/group__cpl__framedata.html                |    2 +-
 html/group__cpl__frameset.html                 |    4 +-
 html/group__cpl__frameset__io.html             |    2 +-
 html/group__cpl__frameset__iterator.html       |   10 +-
 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               |  689 ++++
 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             |    6 +-
 html/group__cpl__recipe.html                   |    2 +-
 html/group__cpl__recipeconfig.html             |    2 +-
 html/group__cpl__recipedefine.html             |    2 +-
 html/group__cpl__regex.html                    |  327 ++
 html/group__cpl__stats.html                    |    2 +-
 html/group__cpl__table.html                    |    2 +-
 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                              |   42 +-
 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 +-
 81 files changed, 7024 insertions(+), 175 deletions(-)

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