Merge branch 'master' into work

Update at Wed Oct 26 21:21:09 EDT 2016 by tim
Disabled the newest unfinished experimental code, which was not
2026-08-23 14:37:42 +02:00 · 2016-10-26 21:21:10 -04:00 · 2016-10-26 21:21:10 -04:00 · 2016-10-26 21:20:42 -04:00
2 changed files with 6 additions and 2 deletions
@@ -1 +1 @@
-1.5.65
+1.5.66
@@ -3051,6 +3051,9 @@ void CombineSerial(char *model, int file)
   int i, j;
   struct valuelist *kv;

+   // Work in progress. . .
+   return;
+
   if ((tp = LookupCellFile(model, file)) == NULL) {
      Printf("Cell: %s does not exist.\n", model);
      return;
@@ -3138,7 +3141,8 @@ void CombineSerial(char *model, int file)
 		        nob->type = PROPERTY;
 		        nob->name = strsave("properties");
 		        nob->node = -2;	/* Don't report as disconnected node */
-		        nob->model.class = strsave(obp->model.class);
+		        nob->model.class = (obp->model.class == NULL) ? NULL :
+					strsave(obp->model.class);
 		        nob->instance.props = NewPropValue(2);

 		        /* Create property record for property "S" */
Author	SHA1	Message	Date
Tim Edwards	0df4190e19	Merge branch 'master' into work	2016-10-26 21:21:10 -04:00
Tim Edwards	2f661ea256	Update at Wed Oct 26 21:21:09 EDT 2016 by tim	2016-10-26 21:21:10 -04:00
Tim Edwards	fca075e1ed	Disabled the newest unfinished experimental code, which was not supposed to have been pushed to git yet.	2016-10-26 21:20:42 -04:00
@@ -1 +1 @@
 .5.65
 .5.66