# HG changeset patch
# User lana
# Date 1324007398 28800
# Node ID b2e4ab8b5fa34d7e127eacc37030126a619f455a
# Parent  6d2030eacdac05d3117c39714b3d8186ed069850# Parent  54928c8850f5498670dd43d6c9299f36de1a6746
Merge

diff -r 6d2030eacdac -r b2e4ab8b5fa3 .hgtags
--- a/.hgtags	Mon Dec 12 08:13:56 2011 -0800
+++ b/.hgtags	Thu Dec 15 19:49:58 2011 -0800
@@ -136,3 +136,6 @@
 e6eed2ff5d5f62bdc815beb5276d23347600c760 jdk8-b12
 adf2a6b5fde14090beb9ebc40c4114132ddee731 jdk8-b13
 54c4bf4b83ecc191351747d5d28da849d34c0243 jdk8-b14
+c9ab96ff23d52d85d5dcce1f9c0fd7a3de418c74 jdk8-b15
+3d45ab79643d5b4cc7e050ae2d9c08b4d89d665e jdk8-b17
+3d45ab79643d5b4cc7e050ae2d9c08b4d89d665e jdk8-b16
diff -r 6d2030eacdac -r b2e4ab8b5fa3 build.properties
--- a/build.properties	Mon Dec 12 08:13:56 2011 -0800
+++ b/build.properties	Thu Dec 15 19:49:58 2011 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, 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
@@ -25,7 +25,7 @@
 
 # Base locations where bundles are located
 slashjava=/java
-drops.dir=${slashjava}/devtools/share/jdk7-drops
+drops.dir=${slashjava}/devtools/share/jdk8-drops
 
 # This is the JDK used to build and run the bootstrap version of javac.
 # The bootstrap javac is used to compile both boostrap versions of the
diff -r 6d2030eacdac -r b2e4ab8b5fa3 make/Makefile
--- a/make/Makefile	Mon Dec 12 08:13:56 2011 -0800
+++ b/make/Makefile	Thu Dec 15 19:49:58 2011 -0800
@@ -99,9 +99,9 @@
   DROPS_DIR = $(ALT_DROPS_DIR)
 else
   ifdef ALT_JDK_DEVTOOLS_DIR
-    DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk7-drops
+    DROPS_DIR = $(ALT_JDK_DEVTOOLS_DIR)/share/jdk8-drops
   else
-    DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk7-drops
+    DROPS_DIR = $(_SLASHJAVA)/devtools/share/jdk8-drops
   endif
 endif