Merge
authorhseigel
Fri, 05 Feb 2016 16:19:32 +0000
changeset 35966 2c762d2a5912
parent 35964 0bb38a7ba933 (current diff)
parent 35965 459c12b7e0e9 (diff)
child 35969 64a34c01c0e2
Merge
--- a/jdk/src/java.base/share/native/libjava/System.c	Fri Feb 05 14:03:05 2016 +0100
+++ b/jdk/src/java.base/share/native/libjava/System.c	Fri Feb 05 16:19:32 2016 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1994, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1994, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -114,7 +114,7 @@
 #define VENDOR_URL_BUG "http://bugreport.java.com/bugreport/"
 #endif
 
-#define JAVA_MAX_SUPPORTED_VERSION 52
+#define JAVA_MAX_SUPPORTED_VERSION 53
 #define JAVA_MAX_SUPPORTED_MINOR_VERSION 0
 
 #ifdef JAVA_SPECIFICATION_VENDOR /* Third party may NOT overwrite this. */