Merge branch 'master' into cde-next

Need to resync before folding current cde-next into master.
2018-07-06 13:19:33 -06:00
parent 87ad4219da cf86199b19
commit 3d8e76a69f
7 changed files with 373 additions and 312 deletions
--- a/cde/lib/DtSvc/DtUtil1/Dt.h
+++ b/cde/lib/DtSvc/DtUtil1/Dt.h
@@ -51,14 +51,14 @@ extern "C" {
 /* CDE Version information */

 #define DtVERSION     		2
-#define DtREVISION    		2
-#define DtUPDATE_LEVEL    	4
+#define DtREVISION    		3
+#define DtUPDATE_LEVEL    	0

 #define DtVERSION_NUMBER	(DtVERSION * 10000 +  \
 				DtREVISION * 100 + \
 				DtUPDATE_LEVEL)

-#define DtVERSION_STRING "CDE Version 2.2.4a"
+#define DtVERSION_STRING "CDE Version 2.3.0"


 /*