[GRASS-SVN] r55024 - grass/trunk/imagery/i.segment
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Feb 13 00:23:59 PST 2013
Author: martinl
Date: 2013-02-13 00:23:59 -0800 (Wed, 13 Feb 2013)
New Revision: 55024
Modified:
grass/trunk/imagery/i.segment/main.c
Log:
i.segment: fix compilation issue from r55022
Modified: grass/trunk/imagery/i.segment/main.c
===================================================================
--- grass/trunk/imagery/i.segment/main.c 2013-02-13 08:10:10 UTC (rev 55023)
+++ grass/trunk/imagery/i.segment/main.c 2013-02-13 08:23:59 UTC (rev 55024)
@@ -36,11 +36,7 @@
G_add_keyword(_("segmentation"));
G_add_keyword(_("object recognition"));
module->description =
-<<<<<<< .mine
- _("Identify segments (objects) from imagery.");
-=======
- _("Outputs a single segmented raster map based on input values in an image group.");
->>>>>>> .r55021
+ _("Identifies segments (objects) from imagery data.");
parse_args(argc, argv, &globals);
More information about the grass-commit
mailing list