[GRASS-git] [OSGeo/grass] f4cab7: r.import

[Markus Metz]

  Branch: refs/heads/master
  Home:   https://github.com/OSGeo/grass
  Commit: f4cab7cc3f5a0a2c4cd355c7e4e768b12ccd0a86
      https://github.com/OSGeo/grass/commit/f4cab7cc3f5a0a2c4cd355c7e4e768b12ccd0a86
  Author: Markus Metz <markus.metz.giswork at gmail.com>
  Date:   2019-08-05 (Mon, 05 Aug 2019)

  Changed paths:
    M scripts/r.import/r.import.py

  Log Message:
  -----------
  r.import

try to avoid failure after v.proj (see PR #24)


  Commit: 2cb165dc8bb38a1262a1036c0bb722677b87d2af
      https://github.com/OSGeo/grass/commit/2cb165dc8bb38a1262a1036c0bb722677b87d2af
  Author: Markus Metz <markus.metz.giswork at gmail.com>
  Date:   2019-08-05 (Mon, 05 Aug 2019)

  Changed paths:
    M REQUIREMENTS.html
    M Vagrantfile
    M display/d.barscale/main.c
    M docker/Dockerfile_alpine
    A docker/Dockerfile_alpine_wxgui
    M gui/wxpython/datacatalog/tree.py
    M imagery/i.vi/i.vi.html
    M imagery/i.vi/main.c
    M include/Make/Html.make
    M lib/init/grass.py
    M lib/python/script/task.py
    M lib/python/temporal/core.py
    M man/Makefile
    M scripts/g.extension/g.extension.py
    M tools/mkhtml.py
    M vector/v.in.ascii/v.in.ascii.html

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/OSGeo/grass


Compare: https://github.com/OSGeo/grass/compare/a37077f69278...2cb165dc8bb3