Revision: 73058
http://sourceforge.net/p/brlcad/code/73058
Author: starseeker
Date: 2019-05-13 18:59:26 +0000 (Mon, 13 May 2019)
Log Message:
-----------
Cherrypick r73001 (SEM numbering correction) from trunk into STABLE
Modified Paths:
--------------
brlcad/branches/STABLE/include/bu/parallel.h
Property Changed:
----------------
brlcad/branches/STABLE/
brlcad/branches/STABLE/CHANGES
brlcad/branches/STABLE/NEWS
brlcad/branches/STABLE/doc/STRATEGY
brlcad/branches/STABLE/src/libbu/
brlcad/branches/STABLE/src/libged/polyclip.cpp
brlcad/branches/STABLE/src/tclscripts/archer/
Index: brlcad/branches/STABLE
===================================================================
--- brlcad/branches/STABLE 2019-05-13 16:23:57 UTC (rev 73057)
+++ brlcad/branches/STABLE 2019-05-13 18:59:26 UTC (rev 73058)
Property changes on: brlcad/branches/STABLE
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/opencl:65867-66137
/brlcad/branches/osg:62110-62113
/brlcad/branches/prep-cache:68236-68933
-/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-66123,66128-66132,66134-68122,68125-72826
\ No newline at end of property
+/brlcad/trunk:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-66123,66128-66132,66134-68122,68125-72826,73001
\ No newline at end of property
Index: brlcad/branches/STABLE/CHANGES
===================================================================
--- brlcad/branches/STABLE/CHANGES 2019-05-13 16:23:57 UTC (rev 73057)
+++ brlcad/branches/STABLE/CHANGES 2019-05-13 18:59:26 UTC (rev 73058)
Property changes on: brlcad/branches/STABLE/CHANGES
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/opencl/CHANGES:65867-66137
/brlcad/branches/osg/CHANGES:62110-62113
/brlcad/branches/prep-cache/CHANGES:68236-68933
-/brlcad/trunk/CHANGES:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-54103,55606-68122,68125-72826
\ No newline at end of property
+/brlcad/trunk/CHANGES:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-54103,55606-68122,68125-72826,73001
\ No newline at end of property
Index: brlcad/branches/STABLE/NEWS
===================================================================
--- brlcad/branches/STABLE/NEWS 2019-05-13 16:23:57 UTC (rev 73057)
+++ brlcad/branches/STABLE/NEWS 2019-05-13 18:59:26 UTC (rev 73058)
Property changes on: brlcad/branches/STABLE/NEWS
___________________________________________________________________
Modified: svn:mergeinfo
## -8,4 +8,4 ##
/brlcad/branches/osg/NEWS:62110-62113
/brlcad/branches/prep-cache/NEWS:68236-68933
/brlcad/trunk:68170-68252
-/brlcad/trunk/NEWS:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-72826
\ No newline at end of property
+/brlcad/trunk/NEWS:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-68122,68125-72826,73001
\ No newline at end of property
Index: brlcad/branches/STABLE/doc/STRATEGY
===================================================================
--- brlcad/branches/STABLE/doc/STRATEGY 2019-05-13 16:23:57 UTC (rev 73057)
+++ brlcad/branches/STABLE/doc/STRATEGY 2019-05-13 18:59:26 UTC (rev 73058)
Property changes on: brlcad/branches/STABLE/doc/STRATEGY
___________________________________________________________________
Modified: svn:mergeinfo
## -7,4 +7,4 ##
/brlcad/branches/opencl/doc/STRATEGY:65867-66137
/brlcad/branches/osg/doc/STRATEGY:62110-62113
/brlcad/branches/prep-cache/doc/STRATEGY:68236-68933
-/brlcad/trunk/doc/STRATEGY:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-66807,67001-72826
\ No newline at end of property
+/brlcad/trunk/doc/STRATEGY:36844-37285,37571-38764,38777-38845,41559-43155,43159-43908,44241-44324,44326-44385,44710-45373,45377,45379-47342,47370-66807,67001-72826,73001
\ No newline at end of property
Modified: brlcad/branches/STABLE/include/bu/parallel.h
===================================================================
--- brlcad/branches/STABLE/include/bu/parallel.h 2019-05-13 16:23:57 UTC
(rev 73057)
+++ brlcad/branches/STABLE/include/bu/parallel.h 2019-05-13 18:59:26 UTC
(rev 73058)
@@ -198,7 +198,7 @@
#define BU_SEM_MALLOC 5
#define BU_SEM_DATETIME 6
#define BU_SEM_HASH 7
-#define BU_SEM_LAST (BU_SEM_DATETIME+1) /* allocate this many for LIBBU+LIBBN
*/
+#define BU_SEM_LAST (BU_SEM_HASH+1) /* allocate this many for LIBBU+LIBBN */
/*
* Automatic restart capability in bu_bomb(). The return from
* BU_SETJUMP is the return from the setjmp(). It is 0 on the first
Index: brlcad/branches/STABLE/src/libbu
===================================================================
--- brlcad/branches/STABLE/src/libbu 2019-05-13 16:23:57 UTC (rev 73057)
+++ brlcad/branches/STABLE/src/libbu 2019-05-13 18:59:26 UTC (rev 73058)
Property changes on: brlcad/branches/STABLE/src/libbu
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
/brlcad/branches/RELEASE/src/libbu:72828-72838
-/brlcad/trunk/src/libbu:72525-72826
\ No newline at end of property
+/brlcad/trunk/src/libbu:72525-72826,73001
\ No newline at end of property
Index: brlcad/branches/STABLE/src/libged/polyclip.cpp
===================================================================
--- brlcad/branches/STABLE/src/libged/polyclip.cpp 2019-05-13 16:23:57 UTC
(rev 73057)
+++ brlcad/branches/STABLE/src/libged/polyclip.cpp 2019-05-13 18:59:26 UTC
(rev 73058)
Property changes on: brlcad/branches/STABLE/src/libged/polyclip.cpp
___________________________________________________________________
Modified: svn:mergeinfo
## -5,4 +5,4 ##
/brlcad/branches/gct/src/libged/polyclip.cpp:62423-62425
/brlcad/branches/osg/src/libged/polyclip.cpp:62110-62113
/brlcad/branches/prep-cache/src/libged/polyclip.cpp:68236-68933
-/brlcad/trunk/src/libged/polyclip.cpp:50761-68099,68132-72826
\ No newline at end of property
+/brlcad/trunk/src/libged/polyclip.cpp:50761-68099,68132-72826,73001
\ No newline at end of property
Index: brlcad/branches/STABLE/src/tclscripts/archer
===================================================================
--- brlcad/branches/STABLE/src/tclscripts/archer 2019-05-13 16:23:57 UTC
(rev 73057)
+++ brlcad/branches/STABLE/src/tclscripts/archer 2019-05-13 18:59:26 UTC
(rev 73058)
Property changes on: brlcad/branches/STABLE/src/tclscripts/archer
___________________________________________________________________
Modified: svn:mergeinfo
## -1,2 +1,2 ##
/brlcad/branches/RELEASE/src/tclscripts/archer:72828-72838
-/brlcad/trunk/src/tclscripts/archer:72525-72826
\ No newline at end of property
+/brlcad/trunk/src/tclscripts/archer:72525-72826,73001
\ No newline at end of property
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
