merging RELEASE branch to STABLE branch, r69907 through r699011

svn:revision:69912 svn:branch:STABLE svn:account:starseeker
BRL-CAD · Jun 11, 2017 · 02e379a · 02e379a
2 parents d213763 + 3117d3d
commit 02e379a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+/bin
+/lib
+/build
diff --git a/NEWS b/NEWS
@@ -10,7 +10,7 @@ descriptive text that emphasizes or further describes significant
 changes made.  See document footer for additional details.
 
 ----------------------------------------------------------------------
---- 2016-07-XX  Release 7.26.2                                     ---
+--- 2017-06-10  Release 7.26.2                                     ---
 ----------------------------------------------------------------------
 
 * upgraded Tcl/Tk from 8.5.9 to 8.5.19 - Sean Morrison
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    /bin
+    /lib
+    /build