This is an automated email from the ASF dual-hosted git repository.
skygo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-native-launchers.git
commit 9ae59c743e7d9afb055f8a26f031a2b46cfb9ac1
Author: Jaroslav Tulach <jaroslav.tul...@apidesign.org>
AuthorDate: Fri Aug 17 17:46:34 2018 +0200
Merging with most recent changes in master
---
jvmlauncher.cpp | 3 +--
version.h | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/jvmlauncher.cpp b/jvmlauncher.cpp
index 7e297f1..74bf1cc 100644
--- a/jvmlauncher.cpp
+++ b/jvmlauncher.cpp
@@ -21,8 +21,7 @@
*/
#include "jvmlauncher.h"
-#include <cassert>
-#include <fstream>
+#include <assert.h>
using namespace std;
diff --git a/version.h b/version.h
index b423ffc..63f0860 100644
--- a/version.h
+++ b/version.h
@@ -17,12 +17,12 @@
* under the License.
*/
-#define COMPANY "Oracle Corporation"
+#define COMPANY ""
#define COMPONENT "NetBeans Platform Launcher"
#define VER "9.0.0.0"
#define FVER 9,0,0,0
-#define BUILD_ID "04012017"
+#define BUILD_ID "03062018"
#define INTERNAL_NAME "nbexec"
-#define COPYRIGHT "\xA9 2007, 2017 Oracle and/or its affiliates. All rights
reserved."
+#define COPYRIGHT "Based on Apache NetBeans from the Apache Software
Foundation and is licensed under Apache License Version 2.0"
#define NAME "NetBeans Platform Launcher"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
