<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
osgeo-main <<<<<<< HEAD ======= osgeo-main ======= bbd009e3f8 (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) ======= a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main ======= 6573d7219c (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) ======= 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD 7a7423b51e (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) ======= b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= 30cf61fe8e (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) ======= 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main <<<<<<< HEAD ======= ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
0b33f0923a (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD c7f651af83 (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) ======= osgeo-main ======= c7f651af83 (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) ======= osgeo-main ======= 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD 5c730e3bfc (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= 5c730e3bfc (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD osgeo-main ======= 67fc38245a (wxpyimgview: explicit conversion to int (#2704)) osgeo-main ======= 67fc38245a (wxpyimgview: explicit conversion to int (#2704)) osgeo-main ======= ======= ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main
0b33f0923a (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) <<<<<<< HEAD c7f651af83 (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD bbd009e3f8 (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) ======= ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= ======= 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD 5c730e3bfc (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) 67fc38245a (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main ======= ======= 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
0b33f0923a (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) <<<<<<< HEAD c7f651af83 (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) <<<<<<< HEAD 6573d7219c (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) ======= ======= ======= 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD 5c730e3bfc (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) 67fc38245a (wxpyimgview: explicit conversion to int (#2704)) 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD ======= 17e44a46cf (wxpyimgview: explicit conversion to int (#2704))
0b33f0923a (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) <<<<<<< HEAD c7f651af83 (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) <<<<<<< HEAD 7a7423b51e (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) ======= ======= ======= 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD 5c730e3bfc (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) ======= ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) 67fc38245a (wxpyimgview: explicit conversion to int (#2704)) b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= ======= fb687ccc49 (wxpyimgview: explicit conversion to int (#2704))
0b33f0923a (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) <<<<<<< HEAD c7f651af83 (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) <<<<<<< HEAD 30cf61fe8e (ci: Remove duplication in Ubuntu workflow, keep test job only (#1749)) ======= ======= ======= 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD 5c730e3bfc (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD fb687ccc49 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) 67fc38245a (wxpyimgview: explicit conversion to int (#2704)) 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main
GRASS GIS (https://grass.osgeo.org/) is a Geographic Information System used for geospatial data management and analysis, image processing, graphics/map production, spatial modeling, and visualization.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
main ======= d7010890e1 (Add Binder badge/button to readme (#1628)) ======= a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= 498a331298 (Fix missing function prototypes (#2727)) 6b0657b022 (Fix missing function prototypes (#2727)) ======= 58e6f5060a (Add Binder badge/button to readme (#1628)) ======= 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= 498a331298 (Fix missing function prototypes (#2727)) 488180fefd (Fix missing function prototypes (#2727)) ======= 50aa049e59 (Add Binder badge/button to readme (#1628)) ======= b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= ======= 498a331298 (Fix missing function prototypes (#2727)) fce97d24c8 (Fix missing function prototypes (#2727)) ======= da4381783c (Add Binder badge/button to readme (#1628)) ======= 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= 498a331298 (Fix missing function prototypes (#2727)) 38fb0d903f (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= ebf041644a (r.horizon manual - fix typo (#2794)) ======= dd6a87c0fa (r.horizon manual - fix typo (#2794)) ======= 5ce081f790 (r.horizon manual - fix typo (#2794)) ======= 498a331298 (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 498a331298 (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= osgeo-main ======= <<<<<<< HEAD <<<<<<< HEAD ======= 498a331298 (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= osgeo-main ======= 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= ======= 498a331298 (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= osgeo-main ======= ebf041644a (r.horizon manual - fix typo (#2794)) ======= <<<<<<< HEAD dd6a87c0fa (r.horizon manual - fix typo (#2794)) ======= ======= 498a331298 (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= osgeo-main main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= osgeo-main ======= 5ce081f790 (r.horizon manual - fix typo (#2794)) ======= ======= 498a331298 (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= osgeo-main Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: 7409ab6716 (r.horizon manual - fix typo (#2794)) f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD main osgeo-main ======= ======= osgeo-main ======= 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= osgeo-main ======= osgeo-main ======= ebf041644a (r.horizon manual - fix typo (#2794)) ======= <<<<<<< HEAD dd6a87c0fa (r.horizon manual - fix typo (#2794)) ======= osgeo-main ======= osgeo-main main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= 5ce081f790 (r.horizon manual - fix typo (#2794)) ======= osgeo-main ======= osgeo-main
======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: <<<<<<< HEAD osgeo-main ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: osgeo-main ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: osgeo-main ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: osgeo-main ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: osgeo-main ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: osgeo-main ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: osgeo-main ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: osgeo-main ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: osgeo-main ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: osgeo-main ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: osgeo-main ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: osgeo-main ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: osgeo-main ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: osgeo-main ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: osgeo-main
<<<<<<< HEAD <<<<<<< HEAD
4fcbd3f967 (Add Binder badge/button to readme (#1628)) =======
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
8422103f4c (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below: ======= osgeo-main
<<<<<<< HEAD <<<<<<< HEAD
4fcbd3f967 (Add Binder badge/button to readme (#1628)) =======
osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) =======
8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD osgeo-main ======= osgeo-main ======= osgeo-main ======= ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below:
<<<<<<< HEAD <<<<<<< HEAD
4fcbd3f967 (Add Binder badge/button to readme (#1628)) <<<<<<< HEAD d7010890e1 (Add Binder badge/button to readme (#1628)) ======= =======
6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= =======
8422103f4c (wxpyimgview: explicit conversion to int (#2704)) a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main ======= ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below:
<<<<<<< HEAD <<<<<<< HEAD
4fcbd3f967 (Add Binder badge/button to readme (#1628)) <<<<<<< HEAD 58e6f5060a (Add Binder badge/button to readme (#1628)) ======= =======
6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= =======
8422103f4c (wxpyimgview: explicit conversion to int (#2704)) 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) b49c22396f (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below:
<<<<<<< HEAD <<<<<<< HEAD
4fcbd3f967 (Add Binder badge/button to readme (#1628)) <<<<<<< HEAD 50aa049e59 (Add Binder badge/button to readme (#1628)) ======= =======
6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) ======= =======
8422103f4c (wxpyimgview: explicit conversion to int (#2704)) b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= ======= ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704)) Launch this repository in Binder and experiment with GRASS's Python API in Jupyter Notebooks by clicking the button below:
<<<<<<< HEAD <<<<<<< HEAD
4fcbd3f967 (Add Binder badge/button to readme (#1628)) <<<<<<< HEAD da4381783c (Add Binder badge/button to readme (#1628)) ======= =======
6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD fb687ccc49 (wxpyimgview: explicit conversion to int (#2704)) ======= =======
8422103f4c (wxpyimgview: explicit conversion to int (#2704)) 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main
In general: you don't really need write access as you can simply open a pull request to contribute to GRASS GIS. See CONTRIBUTING file for more details.
See the INSTALL.md file.
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
main ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD osgeo-main ======= <<<<<<< HEAD <<<<<<< HEAD osgeo-main ======= ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= 6b0657b022 (Fix missing function prototypes (#2727)) ======= 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= osgeo-main ======= osgeo-main ======= 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ======= 488180fefd (Fix missing function prototypes (#2727)) ======= ebf041644a (r.horizon manual - fix typo (#2794)) ======= <<<<<<< HEAD 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) ======= b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= fce97d24c8 (Fix missing function prototypes (#2727)) ======= dd6a87c0fa (r.horizon manual - fix typo (#2794)) ======= osgeo-main ======= osgeo-main main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= fb687ccc49 (wxpyimgview: explicit conversion to int (#2704)) ======= 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704)) ======= 38fb0d903f (Fix missing function prototypes (#2727)) ======= 5ce081f790 (r.horizon manual - fix typo (#2794)) ======= osgeo-main ======= osgeo-main Yes, you should really read INSTALL.md. In addition, there are detailed compile instructions in the Wiki. ======= <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD main Yes, you should really read INSTALL.md. In addition, there are detailed compile instructions in the Wiki. ======= ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main Yes, you should really read INSTALL.md. In addition, there are detailed compile instructions in the Wiki. 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= Yes, you should really read INSTALL.md. In addition, there are detailed compile instructions in the Wiki. 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= Yes, you should really read INSTALL.md. In addition, there are detailed compile instructions in the Wiki. f130b43e6c (r.horizon manual - fix typo (#2794)) ======= 6b0657b022 (Fix missing function prototypes (#2727)) ======= osgeo-main ======= osgeo-main ======= Yes, you should really read INSTALL.md. In addition, there are detailed compile instructions in the Wiki. f130b43e6c (r.horizon manual - fix typo (#2794)) ======= 488180fefd (Fix missing function prototypes (#2727)) ======= osgeo-main ======= osgeo-main ======= Yes, you should really read INSTALL.md. In addition, there are detailed compile instructions in the Wiki. f130b43e6c (r.horizon manual - fix typo (#2794)) ======= fce97d24c8 (Fix missing function prototypes (#2727)) ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= Yes, you should really read INSTALL.md. In addition, there are detailed compile instructions in the Wiki. f130b43e6c (r.horizon manual - fix typo (#2794)) ======= 38fb0d903f (Fix missing function prototypes (#2727)) ======= osgeo-main ======= osgeo-main ======= Yes, you should really read INSTALL.md. In addition, there are detailed compile instructions in the Wiki. f130b43e6c (r.horizon manual - fix typo (#2794)) ======= Yes, you should really read INSTALL.md. In addition, there are detailed compile instructions in the Wiki. <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= osgeo-main ======= osgeo-main ======= ebf041644a (r.horizon manual - fix typo (#2794)) ======= <<<<<<< HEAD dd6a87c0fa (r.horizon manual - fix typo (#2794)) ======= osgeo-main ======= osgeo-main main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= 5ce081f790 (r.horizon manual - fix typo (#2794)) ======= osgeo-main ======= osgeo-main 498a331298 (Fix missing function prototypes (#2727)) ======= 7409ab6716 (r.horizon manual - fix typo (#2794)) f130b43e6c (r.horizon manual - fix typo (#2794)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD main osgeo-main ======= osgeo-main ======= osgeo-main ======= Yes, you should really read INSTALL.md. In addition, there are detailed compile instructions in the Wiki. 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= 498a331298 (Fix missing function prototypes (#2727)) 6b0657b022 (Fix missing function prototypes (#2727)) ======= 8a70512c8d (r.horizon manual - fix typo (#2794)) ======= osgeo-main ======= osgeo-main ======= Yes, you should really read INSTALL.md. In addition, there are detailed compile instructions in the Wiki. 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ======= 498a331298 (Fix missing function prototypes (#2727)) 488180fefd (Fix missing function prototypes (#2727)) ======= ebf041644a (r.horizon manual - fix typo (#2794)) ======= <<<<<<< HEAD Yes, you should really read INSTALL.md. In addition, there are detailed compile instructions in the Wiki. 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) ======= b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= 498a331298 (Fix missing function prototypes (#2727)) fce97d24c8 (Fix missing function prototypes (#2727)) ======= dd6a87c0fa (r.horizon manual - fix typo (#2794)) ======= osgeo-main ======= osgeo-main main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= Yes, you should really read INSTALL.md. In addition, there are detailed compile instructions in the Wiki. 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) fb687ccc49 (wxpyimgview: explicit conversion to int (#2704)) ======= 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704)) ======= 498a331298 (Fix missing function prototypes (#2727)) 38fb0d903f (Fix missing function prototypes (#2727)) ======= 5ce081f790 (r.horizon manual - fix typo (#2794)) ======= osgeo-main ======= osgeo-main
Build a docker image using the downloaded source code (run this in the directory containing the source code):
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
main ======= <<<<<<< HEAD ======= osgeo-main <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= 498a331298 (Fix missing function prototypes (#2727)) <<<<<<< HEAD osgeo-main ======= osgeo-main ======= 5af337c699 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= 498a331298 (Fix missing function prototypes (#2727)) 6b0657b022 (Fix missing function prototypes (#2727)) ======= ======= 498a331298 (Fix missing function prototypes (#2727)) osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) osgeo-main ======= da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= 498a331298 (Fix missing function prototypes (#2727)) 488180fefd (Fix missing function prototypes (#2727)) ======= <<<<<<< HEAD eb0df723eb (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) ======= b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= ======= 498a331298 (Fix missing function prototypes (#2727)) fce97d24c8 (Fix missing function prototypes (#2727)) ======= ======= 498a331298 (Fix missing function prototypes (#2727)) osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) osgeo-main main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) osgeo-main ======= 02c6694ef5 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= fb687ccc49 (wxpyimgview: explicit conversion to int (#2704)) ======= 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704)) ======= ======= 498a331298 (Fix missing function prototypes (#2727)) 38fb0d903f (Fix missing function prototypes (#2727)) ======= ======= 498a331298 (Fix missing function prototypes (#2727)) osgeo-main ======= ======= 498a331298 (Fix missing function prototypes (#2727)) osgeo-main A. Docker image without graphical user interface - wxGUI.
A. Docker image without graphical user interface - wxGUI.
7409ab6716 (r.horizon manual - fix typo (#2794)) f130b43e6c (r.horizon manual - fix typo (#2794))
docker build -t grassgis .
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> main
=======
>>>>>>> 8a70512c8d (r.horizon manual - fix typo (#2794))
=======
>>>>>>> ebf041644a (r.horizon manual - fix typo (#2794))
=======
>>>>>>> dd6a87c0fa (r.horizon manual - fix typo (#2794))
=======
>>>>>>> 5ce081f790 (r.horizon manual - fix typo (#2794))
=======
>>>>>>> 498a331298 (Fix missing function prototypes (#2727))
A. Docker image **without graphical user interface - wxGUI**.
=======
=======
A. Docker image **without graphical user interface - wxGUI**.
>>>>>>> 7409ab6716 (r.horizon manual - fix typo (#2794))
>>>>>>> f130b43e6c (r.horizon manual - fix typo (#2794))
```bash
docker build -t grassgis .
=======
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
docker build -t grassgis80 . <<<<<<< HEAD
73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) =======
docker build -t grassgis .
>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
=======
<<<<<<< HEAD
>>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
>>>>>>> main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
```bash
docker build -t grassgis .
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
<<<<<<< HEAD
>>>>>>> main
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
docker build -t grassgis80 . <<<<<<< HEAD
73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) <<<<<<< HEAD 5af337c699 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= ======= 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main =======
docker build -t grassgis80 .
<<<<<<< HEAD
>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
<<<<<<< HEAD
>>>>>>> da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
=======
>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
>>>>>>> 9f683ad6d3 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
=======
<<<<<<< HEAD
docker build -t grassgis80 . <<<<<<< HEAD
73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) <<<<<<< HEAD eb0df723eb (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= ======= 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) 8df9861e42 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) ======= b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main =======
docker build -t grassgis80 .
<<<<<<< HEAD
>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
<<<<<<< HEAD
>>>>>>> 02c6694ef5 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
=======
>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
>>>>>>> e14069d05d (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> fb687ccc49 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
A test run (assuming you have the existing GRASS GIS test location; it can be downloaded from here)
# case 1: launching in the grassdata directory in which the location is stored:
docker run -it --rm --user=$(id -u):$(id -g) --volume $(pwd):/data \
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> main
=======
>>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> fb687ccc49 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704))
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
>>>>>>> osgeo-main
=======
<<<<<<< HEAD
<<<<<<< HEAD
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
>>>>>>> osgeo-main
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
>>>>>>> osgeo-main
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
>>>>>>> osgeo-main
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
>>>>>>> osgeo-main
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
>>>>>>> osgeo-main
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
>>>>>>> osgeo-main
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
>>>>>>> osgeo-main
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
>>>>>>> osgeo-main
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
>>>>>>> osgeo-main
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
>>>>>>> osgeo-main
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
>>>>>>> osgeo-main
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
>>>>>>> osgeo-main
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
>>>>>>> osgeo-main
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
>>>>>>> osgeo-main
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
>>>>>>> osgeo-main
--env HOME=/data/ grassgis80 grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
--env HOME=/data/ grassgis80 grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
=======
>>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> 9f683ad6d3 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> 8df9861e42 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> e14069d05d (Programmer's manual: update GRASS GIS arch drawing (#1610))
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
--env HOME=/data/ grassgis80 grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5af337c699 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
=======
--env HOME=/data/ grassgis80 grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
>>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
--env HOME=/data/ grassgis80 grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
>>>>>>> da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
=======
--env HOME=/data/ grassgis80 grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
>>>>>>> 9f683ad6d3 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
=======
<<<<<<< HEAD
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
--env HOME=/data/ grassgis80 grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
>>>>>>> eb0df723eb (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
=======
--env HOME=/data/ grassgis80 grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
>>>>>>> 8df9861e42 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704))
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
>>>>>>> main
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
=======
--env HOME=/data/ grassgis80 grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
>>>>>>> 02c6694ef5 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
=======
--env HOME=/data/ grassgis80 grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
>>>>>>> e14069d05d (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> fb687ccc49 (wxpyimgview: explicit conversion to int (#2704))
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704))
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
--env HOME=/data/ grassgis grass --text nc_basic_spm_grass7/user1 \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
--exec g.region -p
# case 2: launching anywhere
docker run -it --rm --user=$(id -u):$(id -g) \
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> main
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> osgeo-main
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> osgeo-main
=======
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> osgeo-main
=======
>>>>>>> 5af337c699 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> 9f683ad6d3 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
=======
<<<<<<< HEAD
>>>>>>> eb0df723eb (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> 8df9861e42 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
>>>>>>> main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> 02c6694ef5 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> e14069d05d (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> fb687ccc49 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
--volume /your/test/grassdata/:/data --env HOME=/data/ grassgis \
grass /data/nc_basic_spm_grass7/PERMANENT --exec g.region -p
Note that the first grassgis
is the name of the image while the second
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
main ======= ======= osgeo-main ======= osgeo-main ======= 5af337c699 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= osgeo-main ======= osgeo-main ======= da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= <<<<<<< HEAD eb0df723eb (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= osgeo-main ======= osgeo-main main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= 02c6694ef5 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= osgeo-main ======= osgeo-main ======= --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis80
grass /data/nc_basic_spm_grass7/PERMANENT --exec g.region -p
Note that the first `grassgis80` is the name of the image while the second
>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> 9f683ad6d3 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
<<<<<<< HEAD
>>>>>>> 8df9861e42 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
>>>>>>> main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> e14069d05d (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
--volume /your/test/grassdata/:/data --env HOME=/data/ grassgis80 \
grass /data/nc_basic_spm_grass7/PERMANENT --exec g.region -p
Note that the first grassgis80
is the name of the image while the second
227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main ======= 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= fb687ccc49 (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main ======= --volume /your/test/grassdata/:/data --env HOME=/data/ grassgis
grass /data/nc_basic_spm_grass7/PERMANENT --exec g.region -p
Note that the first `grassgis` is the name of the image while the second
>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
=======
<<<<<<< HEAD
>>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
>>>>>>> main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
--volume /your/test/grassdata/:/data --env HOME=/data/ grassgis \
grass /data/nc_basic_spm_grass7/PERMANENT --exec g.region -p
Note that the first grassgis
is the name of the image while the second
8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD main osgeo-main ======= osgeo-main ======= osgeo-main ======= 5af337c699 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main ======= da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= 9f683ad6d3 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD eb0df723eb (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= 8df9861e42 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) ======= b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= 02c6694ef5 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= e14069d05d (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= fb687ccc49 (wxpyimgview: explicit conversion to int (#2704)) ======= 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main
grass
is the name of the executable.
To run the tests (again assuming local location):
docker run -it --rm --user=$(id -u):$(id -g) \
--volume /your/test/grassdata/:/data --env HOME=/data/ -w /code/grass \
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> main
=======
>>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> fb687ccc49 (wxpyimgview: explicit conversion to int (#2704))
=======
>>>>>>> 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704))
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
=======
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
>>>>>>> osgeo-main
=======
<<<<<<< HEAD
<<<<<<< HEAD
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
>>>>>>> osgeo-main
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
>>>>>>> osgeo-main
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
>>>>>>> osgeo-main
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
>>>>>>> osgeo-main
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
>>>>>>> osgeo-main
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
>>>>>>> osgeo-main
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
>>>>>>> osgeo-main
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
>>>>>>> osgeo-main
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
>>>>>>> osgeo-main
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
>>>>>>> osgeo-main
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
>>>>>>> osgeo-main
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
>>>>>>> osgeo-main
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
>>>>>>> osgeo-main
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
>>>>>>> osgeo-main
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
>>>>>>> osgeo-main
grassgis80 grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
grassgis80 grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
>>>>>>> osgeo-main
=======
=======
>>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> 9f683ad6d3 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> 8df9861e42 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> e14069d05d (Programmer's manual: update GRASS GIS arch drawing (#1610))
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
grassgis80 grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
>>>>>>> 5af337c699 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
=======
grassgis80 grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
>>>>>>> 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704))
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704))
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
grassgis80 grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
>>>>>>> da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
=======
grassgis80 grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
>>>>>>> 9f683ad6d3 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> 6f30700108 (wxpyimgview: explicit conversion to int (#2704))
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704))
=======
<<<<<<< HEAD
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
grassgis80 grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
>>>>>>> eb0df723eb (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
=======
grassgis80 grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
>>>>>>> 8df9861e42 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> 17e44a46cf (wxpyimgview: explicit conversion to int (#2704))
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> b49c22396f (wxpyimgview: explicit conversion to int (#2704))
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
>>>>>>> main
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
=======
grassgis80 grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610))
>>>>>>> 02c6694ef5 (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
=======
grassgis80 grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610))
>>>>>>> e14069d05d (Programmer's manual: update GRASS GIS arch drawing (#1610))
=======
>>>>>>> fb687ccc49 (wxpyimgview: explicit conversion to int (#2704))
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704))
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
=======
=======
grassgis grass /data/nc_basic_spm_grass7/PERMANENT --exec \
>>>>>>> 8422103f4c (wxpyimgview: explicit conversion to int (#2704))
>>>>>>> osgeo-main
python -m grass.gunittest.main \
--location nc_basic_spm_grass7 --location-type nc
B. Docker image with graphical user interface - wxGUI.
docker build -t grassgis -f docker/ubuntu_wxgui/Dockerfile .
Note that the first grassgis
is the name of the image while the second
grass
is the name of the executable.
xhost local:$(id -u)
docker run -it --privileged --user=$(id -u):$(id -g) --rm \
--volume="$(pwd)/:/data" --volume="/tmp/.X11-unix:/tmp/.X11-unix:rw" \
--env HOME=/data/ --env DISPLAY=$DISPLAY \
--device="/dev/dri/card0:/dev/dri/card0" \
grassgis grass --gui
Note: If you compiled locally before building the Docker image, you may encounter problems as the local configuration and the locally compiled files are copied to and used in the Docker image. To make sure you don't have this issue, clean all the compiled files from the source code:
make distclean
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
osgeo-main <<<<<<< HEAD ======= osgeo-main ======= ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main ======= 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) ======= b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= fb687ccc49 (wxpyimgview: explicit conversion to int (#2704)) ======= 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main
osgeo-main
<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD
020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= osgeo-main ======= osgeo-main ======= 9f683ad6d3 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= <<<<<<< HEAD 8df9861e42 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= osgeo-main ======= osgeo-main main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= e14069d05d (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= osgeo-main ======= osgeo-main ======= ======= 227cbcebbf (Programmer's manual: update GRASS GIS arch drawing (#1610)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD main ======= ======= 5af337c699 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= 020d15913e (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= osgeo-main ======= osgeo-main ======= ======= da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= 9f683ad6d3 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= <<<<<<< HEAD ======= eb0df723eb (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= 8df9861e42 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= osgeo-main ======= osgeo-main main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= ======= 02c6694ef5 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= e14069d05d (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= osgeo-main ======= osgeo-main You can generate locally the GRASS GIS Programmer's Manual.
This needs doxygen (http://www.doxygen.org) and optionally Graphviz dot (http://www.research.att.com/sw/tools/graphviz/).
To build the GRASS programmer's documentation, run
make htmldocs
or to generate documentation as single html file (recommended for simple reading)
make htmldocs-single
here. This takes quite some time. The result is in lib/html/index.html
which refers to further document repositories in
lib/vector/html/index.html
lib/db/html/index.html
lib/gis/html/index.html
The master file is: ./grasslib.dox
where all sub-documents have to
be linked into.
To generate the documents in PDF format, run
make pdfdocs
73a1a8ce38 (Programmer's manual: update GRASS GIS arch drawing (#1610)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= ======= osgeo-main ======= osgeo-main main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ======= 8422103f4c (wxpyimgview: explicit conversion to int (#2704)) <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD ======= <<<<<<< HEAD main osgeo-main ======= osgeo-main ======= osgeo-main ======= 5af337c699 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= ======= 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) ebc6d3f683 (wxpyimgview: explicit conversion to int (#2704)) ======= a2d9fb4362 (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main ======= da1bbb9bd2 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= ======= 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) 6f30700108 (wxpyimgview: explicit conversion to int (#2704)) ======= 8f5c741ca6 (wxpyimgview: explicit conversion to int (#2704)) ======= <<<<<<< HEAD eb0df723eb (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= ======= 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) 17e44a46cf (wxpyimgview: explicit conversion to int (#2704)) ======= b49c22396f (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= osgeo-main ======= 02c6694ef5 (Programmer's manual: update GRASS GIS arch drawing (#1610)) ======= ======= 6cf60c76a4 (wxpyimgview: explicit conversion to int (#2704)) fb687ccc49 (wxpyimgview: explicit conversion to int (#2704)) ======= 5788bd15e5 (wxpyimgview: explicit conversion to int (#2704)) ======= osgeo-main ======= osgeo-main