Revision: 77153
          http://sourceforge.net/p/brlcad/code/77153
Author:   starseeker
Date:     2020-09-14 12:26:36 +0000 (Mon, 14 Sep 2020)
Log Message:
-----------
merging RELEASE branch to STABLE branch, r77150 through r77152

Modified Paths:
--------------
    brlcad/branches/STABLE/ChangeLog

Property Changed:
----------------
    brlcad/branches/STABLE/

Index: brlcad/branches/STABLE
===================================================================
--- brlcad/branches/STABLE      2020-09-14 12:21:05 UTC (rev 77152)
+++ brlcad/branches/STABLE      2020-09-14 12:26:36 UTC (rev 77153)

Property changes on: brlcad/branches/STABLE
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
-/brlcad/branches/RELEASE:60491,61063,61075-66129,66135,66164,66169-68615,68617-77150
+/brlcad/branches/RELEASE:60491,61063,61075-66129,66135,66164,66169-68615,68617-77152
 /brlcad/branches/STABLE:66164
 /brlcad/branches/bioh:75720-75728,76354,76366-76367,76377-76506
 
/brlcad/branches/brep-debug:61373,61375,61404,61427,61429,61470,61544,61567,61576,61999,62018,62094,62098,62107,62117,62406,62416-62519,62521-62584,62593-62614,62623,62658,62660-62674,62681-62771,62876,62901,62907,62910,62925,62928,62931-63025,63027,63051,63054-63056,63069,63071-63073,63122,63160-63161,63165,63171,63184,63187,63189-63190,63193-63196,63200,63202,63205-63210,63213,63219-63225,63232-63233,63236,63238,63338,63350-63353,63481,63618,63669,64173-64174,64176-64177,64229-64233,64242,64244,64360-64362,65165,65245,65249,65334,65833-65834,66370-66375,66931-66932,66934,67012-67015,67018-67019,67021-67022,67406,67740,67746-67748,67950,67952,68144-68145,68636,68640-68643,68820,69081,69109,69168,69206,69289,69346,69460-69461,69582-69583,69719-69721,69857-69859,69927,69995-69996,70148-70149,70347-70349,70377,70526-70527,71006-71007,71009-71022,71046-71047,71049,71096-71100
Modified: brlcad/branches/STABLE/ChangeLog
===================================================================
--- brlcad/branches/STABLE/ChangeLog    2020-09-14 12:21:05 UTC (rev 77152)
+++ brlcad/branches/STABLE/ChangeLog    2020-09-14 12:26:36 UTC (rev 77153)
@@ -203,32 +203,6 @@
          /dev/null is a special device and -f is only for regular files,
          so we really just want to check for existence here.
 
-2020-09-10 15:20  starseeker
-
-       * [r77100] include/gcv/api.h:
-         Actually, we probably want to use the context mime type on
-         filters.
-
-2020-09-10 14:28  starseeker
-
-       * [r77099] include/gcv/api.h, src/conv/3dm/3dm-g.c,
-         src/conv/gcv/gcv.c, src/libgcv/gcv.c,
-         src/libgcv/plugins/asc/asc.cpp,
-         src/libgcv/plugins/decimate/decimate.c,
-         src/libgcv/plugins/fastgen4/fastgen4_read.c,
-         src/libgcv/plugins/fastgen4/fastgen4_write.cpp,
-         src/libgcv/plugins/gdal/gdal.cpp,
-         src/libgcv/plugins/obj/obj_read.c,
-         src/libgcv/plugins/obj/obj_write.c,
-         src/libgcv/plugins/rhino/rhino_read.cpp,
-         src/libgcv/plugins/stl/stl_read.c,
-         src/libgcv/plugins/stl/stl_write.c,
-         src/libgcv/plugins/vol/png_read.c,
-         src/libgcv/plugins/vrml/vrml_read/vrml_read.cpp,
-         src/libgcv/plugins/vrml/vrml_write.c:
-         Attempt to generalize the GCV plugin typing system beyond just
-         models.
-
 2020-09-10 04:20  brlcad
 
        * [r77098] include/icv/io.h:

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.



_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to