[grass] 04/09: Merge tag 'upstream/7.4.0'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository grass.

commit a64bba8e9f85ace0384b256d8c70fa70fca268c2
Merge: e369d22 41c56b6
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jan 26 11:29:05 2018 +0100

    Merge tag 'upstream/7.4.0'
    
    Upstream version 7.4.0

 ChangeLog_7.4.0.gz                                 |  Bin 0 -> 882545 bytes
 ChangeLog_7.4.0RC2.gz                              |  Bin 881734 -> 0 bytes
 contributors.csv                                   |    2 +-
 display/d.text/d.text.html                         |   16 +-
 display/d.text/d_text.png                          |  Bin 0 -> 23691 bytes
 doc/howto_release.txt                              |  347 +--
 doc/infrastructure.txt                             |   17 +-
 gui/wxpython/core/ws.py                            |    6 +-
 gui/wxpython/datacatalog/tree.py                   |    4 +-
 gui/wxpython/photo2image/g.gui.photo2image.html    |   10 +-
 gui/wxpython/photo2image/g.gui.photo2image.py      |    2 +-
 gui/wxpython/photo2image/ip2i_manager.py           |    4 +-
 gui/wxpython/photo2image/ip2i_mapdisplay.py        |    2 +-
 gui/wxpython/photo2image/ip2i_statusbar.py         |    2 +-
 gui/wxpython/photo2image/ip2i_toolbars.py          |    2 +-
 imagery/i.atcorr/aerosolmodel.cpp                  |    2 +-
 imagery/i.atcorr/iwave.cpp                         | 3145 +++++---------------
 .../i.ortho.photo/i.ortho.photo/i.ortho.photo.html |    4 +-
 imagery/i.ortho.photo/i.ortho.photo/menu.c         |   11 -
 include/Make/Grass.make                            |    2 +-
 include/VERSION                                    |    2 +-
 lib/Makefile                                       |    2 +-
 lib/raster/gdal.c                                  |    7 +-
 mswindows/osgeo4w/package.sh                       |    3 +-
 mswindows/osgeo4w/setup_x86.hint.tmpl              |    4 +-
 mswindows/osgeo4w/setup_x86_64.hint.tmpl           |    4 +-
 raster/r.horizon/r.horizon.html                    |    6 +-
 .../r.series.accumulate/r.series.accumulate.html   |   46 +-
 raster/r.series/r.series.html                      |   51 +-
 raster/r.sun/r.sun.html                            |    4 +-
 rpm/grass.spec                                     |  555 ++++
 scripts/r.fillnulls/r.fillnulls.py                 |    9 +-
 temporal/t.rast.algebra/t.rast.algebra.html        |    4 +-
 vector/v.clean/v.clean.html                        |    5 +-
 vector/v.generalize/main.c                         |    2 +
 35 files changed, 1546 insertions(+), 2736 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git