Mercurial > hg > release > icedtea7-forest-2.3

changeset 686:2ce335eb4926 icedtea-2.3.13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk7u25-b16
author andrew
date Thu, 08 Aug 2013 23:20:11 +0100
parents 8f7b2e697b59 (diff) 12c2f4ce55d0 (current diff)
children 66eecafe5565
files .hgtags
diffstat 3 files changed, 26 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jun 11 11:45:08 2013 -0700
+++ b/.hgtags	Thu Aug 08 23:20:11 2013 +0100
@@ -50,6 +50,7 @@
 3ac6dcf7823205546fbbc3d4ea59f37358d0b0d4 jdk7-b73
 2c88089b6e1c053597418099a14232182c387edc jdk7-b74
 d1516b9f23954b29b8e76e6f4efc467c08c78133 jdk7-b75
+f0bfd9bd1a0e674288a8a4d17dcbb9e632b42e6d icedtea7-1.12
 c8b63075403d53a208104a8a6ea5072c1cb66aab jdk7-b76
 1f17ca8353babb13f4908c1f87d11508232518c8 jdk7-b77
 ab4ae8f4514693a9fe17ca2fec0239d8f8450d2c jdk7-b78
@@ -63,6 +64,7 @@
 433a60a9c0bf1b26ee7e65cebaa89c541f497aed jdk7-b86
 6b1069f53fbc30663ccef49d78c31bb7d6967bde jdk7-b87
 82135c848d5fcddb065e98ae77b81077c858f593 jdk7-b88
+195fcceefddce1963bb26ba32920de67806ed2db icedtea7-1.13
 7f1ba4459972bf84b8201dc1cc4f62b1fe1c74f4 jdk7-b89
 425ba3efabbfe0b188105c10aaf7c3c8fa8d1a38 jdk7-b90
 97d8b6c659c29c8493a8b2b72c2796a021a8cf79 jdk7-b91
@@ -111,6 +113,7 @@
 ddc2fcb3682ffd27f44354db666128827be7e3c3 jdk7-b134
 783bd02b4ab4596059c74b10a1793d7bd2f1c157 jdk7-b135
 2fe76e73adaa5133ac559f0b3c2c0707eca04580 jdk7-b136
+d4aea1a51d625f5601c840714c7c94f1de5bc1af icedtea-1.14
 7654afc6a29e43cb0a1343ce7f1287bf690d5e5f jdk7-b137
 fc47c97bbbd91b1f774d855c48a7e285eb1a351a jdk7-b138
 7ed6d0b9aaa12320832a7ddadb88d6d8d0dda4c1 jdk7-b139
@@ -123,6 +126,7 @@
 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01
 d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
+3defd24c2671eb2e7796b5dc45b98954341d73a7 icedtea-2.0-branchpoint
 34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02
 bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03
 f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04
@@ -141,6 +145,7 @@
 b2deaf5bde5ec455a06786e8e2aea2e673be13aa jdk7u2-b12
 c95558e566ac3605c480a3d070b1102088dab07f jdk7u2-b13
 e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u2-b21
+a66b58021165f5a43e3974fe5fb9fead29824098 icedtea-2.1-branchpoint
 e30fd289f0019700575593ee4e1635fbc5c9a484 jdk7u3-b02
 becd013ae6072a6633ba015fc4f5862fca589cee jdk7u3-b03
 d64361a28584728aa25dca3781cffbaf4199e088 jdk7u3-b04
@@ -157,6 +162,7 @@
 2b07c262a8a9ff78dc908efb9d7b3bb099df9ac4 jdk7u4-b10
 1abfee16e8cc7e3950052befa78dbf14a5ca9cfc jdk7u4-b11
 e6f915094dccbba16df6ebeb002e6867392eda40 jdk7u4-b12
+e7886f5ad6cc837092386fa513e670d4a770456c icedtea-2.2-branchpoint
 9108e3c2f07ffa218641d93893ac9928e95d213a jdk7u4-b13
 d9580838fd08872fc0da648ecfc6782704b4aac1 jdk7u4-b14
 008753000680a2008175d14b25373356f531aa07 jdk7u4-b15
@@ -191,6 +197,7 @@
 528f1589f5f2adf18d5d21384ba668b9aa79841e jdk7u6-b15
 7b77364eb09faac4c37ce9dd2c2308ca5525f18f jdk7u6-b16
 b7c1b441d131c70278de299b5d1e59dce0755dc5 jdk7u6-b17
+0e7b94bd450d4270d4e9bd6c040c94fa4be714a6 icedtea-2.3-branchpoint
 9c41f7b1460b106d18676899d24b6ea07de5a369 jdk7u6-b18
 56291720b5e578046bc02761dcad2a575f99fd8e jdk7u6-b19
 e79fa743fe5a801db4acc7a7daa68f581423e5d3 jdk7u6-b20
@@ -199,6 +206,15 @@
 d1c709f1196a73d1df10d04a221b10e30fd2eb48 jdk7u6-b23
 e4def733cc8c58e83b7cefa7edd89a3e2b793520 jdk7u6-b24
 f5f546dba006778854e7a81141fc1b44acd257a4 jdk7u6-b30
+dda13866dd2855c304ba3801194f7ca3cffc3535 icedtea-2.3
+2783cace584cbfa3ed52774185859faf41569f8e icedtea-2.3.1
+a3fa5d49d528c32ad5d4b49e7241696a672ffe18 icedtea-2.3.2
+acba2d30209d19a87dbc0d2a6e366f09f01a210d icedtea-2.3.3
+301e79a966b4627af0113e30f65409baf9ebf1ce icedtea-2.3.4
+8bd8e70d4a032ea3d3642b247dddc0882850ebe0 icedtea-2.3.5
+02128561d696aaaa1a12b0ebfad2580cbbe04b87 icedtea-2.3.6
+02128561d696aaaa1a12b0ebfad2580cbbe04b87 icedtea-2.3.6
+0000000000000000000000000000000000000000 icedtea-2.3.6
 43775eae8df6c874fb3631c86009505cf3821b1f jdk7u6-b31
 43775eae8df6c874fb3631c86009505cf3821b1f jdk7u7-b10
 a380c75873bfb578e605d4362edb18c08698cc3e jdk7u7-b30
@@ -237,6 +253,10 @@
 80a3d0bcd3d4c9e83b75416178bdd60a2d23ebbc jdk7u11-b07
 e7c55def6796d3c426631b5717084ef122908847 jdk7u11-b08
 2412f7b8551ede5296cb6e1d6189f40aad9eeffe jdk7u13-b09
+0000000000000000000000000000000000000000 icedtea-2.3.6
+0e569b50110e197ae20f7b8ef0a26e41f987fee6 icedtea-2.3.6
+dd8d1a8f222f0e93db652cd5127644ab737eef5d icedtea-2.3.7
+506161df1c48a9c9f7f0d8db7108a0b1ab83493b icedtea-2.3.8
 3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b10
 527d3cf769ec073d7348e4c31f97c47c943c96b6 jdk7u13-b30
 3b7815df113f8044039739276237b964ee8fa015 jdk7u13-b20
@@ -248,6 +268,10 @@
 f37a75bd39595ba38bdc53ee957c63bbb3cbb12d jdk7u15-b03
 2412f7b8551ede5296cb6e1d6189f40aad9eeffe jdk7u15-b32
 0c2b2dae93e7a720bbcc2e13a1913a2264335554 jdk7u17-b01
+12b96a57263c1215818f4d1abfb6dc8b4bc6b436 icedtea-2.3.9
+fb1ac57ada6c9de6313982f0ab63276547b8819b icedtea-2.3.10
+f143f229bd127586e9553378c115136f461e58c2 icedtea-2.3.11
+e62743867f54fd52b397541a266cc1c35f25ee3c icedtea-2.3.12
 8e49ff2feda30801d7826ca1778eb7b901a7089c jdk7u17-b02
 933d424580f967ed11eda2bbfd690f985a72df6e jdk7u17-b30
 790582955edb617b41abbc73cf82544dbf8c1d97 jdk7u17-b31
--- a/.jcheck/conf	Tue Jun 11 11:45:08 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-project=jdk7
-bugids=dup
--- a/make/Defs-internal.gmk	Tue Jun 11 11:45:08 2013 -0700
+++ b/make/Defs-internal.gmk	Thu Aug 08 23:20:11 2013 +0100
@@ -322,7 +322,8 @@
     JDK_MICRO_VERSION=$(JDK_MICRO_VERSION) \
     PREVIOUS_MAJOR_VERSION=$(PREVIOUS_MAJOR_VERSION) \
     PREVIOUS_MINOR_VERSION=$(PREVIOUS_MINOR_VERSION) \
-    PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION)
+    PREVIOUS_MICRO_VERSION=$(PREVIOUS_MICRO_VERSION) \
+    STATIC_CXX=$(STATIC_CXX)
 
 ifdef ARCH_DATA_MODEL
   COMMON_BUILD_ARGUMENTS += ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)