[cpl] 01/02: 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.

commit b03ac85e5cee3045fec5f71c21cab1048473259d
Merge: 6585fc3 a9f2ca4
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Mar 19 09:50:55 2014 +0100

    Merge branch 'upstream' into debian

 configure                                      | 24 +++++-----
 configure.ac                                   |  4 +-
 cplcore/cpl_propertylist.c                     | 20 +++++---
 cplcore/cpl_test.c                             |  4 ++
 cplui/cpl_frameset.c                           | 65 +++++++++++++++++++-------
 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       |  6 +--
 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__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__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                              |  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 +-
 70 files changed, 146 insertions(+), 105 deletions(-)

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