[grass] 02/05: Merge tag 'upstream/7.0.4'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository grass.

commit a40b4720423a4269d7ef8eef479047bd9863a450
Merge: f89274b e641ac3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun May 1 15:59:04 2016 +0200

    Merge tag 'upstream/7.0.4'
    
    Upstream version 7.0.4

 ChangeLog_7.0.4.gz                             | Bin 0 -> 827868 bytes
 ChangeLog_7.0.4RC1.gz                          | Bin 827109 -> 0 bytes
 display/d.mon/d.mon.html                       |   9 +-
 general/g.copy/g.copy.html                     |  29 +--
 general/g.proj/g.proj.html                     |  31 ++-
 gui/wxpython/docs/wxGUI.html                   |   4 +-
 include/VERSION                                |   2 +-
 lib/gis/datum.table                            |  26 ++-
 lib/gis/datumtransform.table                   |  14 +-
 lib/proj/convert.c                             |  19 +-
 raster/r.in.xyz/r.in.xyz.html                  |  45 ++++-
 raster/r.mapcalc/r.mapcalc.html                |   2 +-
 raster/r.mapcalc/r3.mapcalc.html               |   2 +-
 raster/r.sim/r.sim.sediment/main.c             | 164 ++++++++--------
 raster/r.sim/r.sim.water/main.c                | 159 ++++++++--------
 raster/r.sim/simlib/Makefile                   |   5 +-
 raster/r.sim/simlib/hydro.c                    |  10 +-
 raster/r.sim/simlib/input.c                    | 251 ++++++++++++++++++++++++-
 raster/r.sim/simlib/observation_points.c       |  19 +-
 raster/r.sim/simlib/output.c                   |   4 +-
 raster/r.sim/simlib/simlib.h                   |  96 ++++++++++
 raster/r.sim/simlib/waterglobs.h               |  28 +--
 raster/r.sim/test/test.sh                      |  47 +++++
 raster/r.water.outlet/r.water.outlet.html      |   6 +-
 scripts/g.search.modules/g.search.modules.html |   4 +-
 scripts/r.pack/r.pack.html                     |   2 +-
 vector/v.db.select/main.c                      |   2 +-
 vector/v.net/v.net.html                        |  14 +-
 28 files changed, 718 insertions(+), 276 deletions(-)

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