Merge branch 'master' into release-iteration2

adamkorynta · web-flow · commit b1f2a94c82a0 · 2019-05-16T15:02:46.000-07:00
diff --git a/DependencyGraph.png b/DependencyGraph.png
diff --git a/branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties b/branding/src/main/nbm-branding/core/core.jar/org/netbeans/core/startup/Bundle.properties
@@ -17,3 +17,5 @@ SplashProgressBarBounds=12,438,900,6
 SplashProgressBarColor=0x68D5
 SplashRunningTextBounds=12,420,475,12
 SplashRunningTextFontSize=12
+LBL_Copyright=<div style\="font-size\: 12pt; font-family\: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif; ">Enhanced Post Processing Tool (EPPT) Copyright (c) 2019.<br/>EPPT is copyrighted by the State of California, Department of Water Resources. It is licensed<br/> under the GNU General Public License, version 2. This means it can be<br/> copied, distributed, and modified freely, but you may not restrict others <br/> in their ability to copy, distribute, and modify it. See the license below <br/> for more details.</div>
+
diff --git a/branding/src/main/nbm-branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties b/branding/src/main/nbm-branding/modules/org-netbeans-core.jar/org/netbeans/core/ui/Bundle.properties
@@ -10,4 +10,4 @@
 # GNU General Public License
 #
 LBL_ProductInformation=DWR Enhanced Post Processing Tool v1.0.1
-LBL_Copyright=<div style\="font-size\: 12pt; font-family\: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif; ">Copyright &copy; 2019 <br/>California Department of Water Resources<br/>All Rights Reserved.  DWR PROPRIETARY/CONFIDENTIAL.  <br/>Source may not be released without written approval from DWR</div>
+LBL_Copyright=<div style\="font-size\: 12pt; font-family\: Verdana, 'Verdana CE',  Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif; ">Enhanced Post Processing Tool (EPPT) Copyright (c) 2019.<br/>EPPT is copyrighted by the State of California, Department of Water Resources. It is licensed<br/> under the GNU General Public License, version 2. This means it can be<br/> copied, distributed, and modified freely, but you may not restrict others <br/> in their ability to copy, distribute, and modify it. See the license below <br/> for more details.</div>

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,4 @@`
`10`	`10`	`# GNU General Public License`
`11`	`11`	`#`
`12`	`12`	`LBL_ProductInformation=DWR Enhanced Post Processing Tool v1.0.1`
`13`		`-LBL_Copyright=<div style\="font-size\: 12pt; font-family\: Verdana, 'Verdana CE', Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif; ">Copyright © 2019 <br/>California Department of Water Resources<br/>All Rights Reserved. DWR PROPRIETARY/CONFIDENTIAL. <br/>Source may not be released without written approval from DWR</div>`
	`13`	+LBL_Copyright=<div style\="font-size\: 12pt; font-family\: Verdana, 'Verdana CE', Arial, 'Arial CE', 'Lucida Grande CE', lucida, 'Helvetica CE', sans-serif; ">Enhanced Post Processing Tool (EPPT) Copyright (c) 2019.<br/>EPPT is copyrighted by the State of California, Department of Water Resources. It is licensed<br/> under the GNU General Public License, version 2. This means it can be<br/> copied, distributed, and modified freely, but you may not restrict others <br/> in their ability to copy, distribute, and modify it. See the license below <br/> for more details.</div>