Mercurial > hg > release > icedtea8-forest-3.0 > corba

changeset 1179:e2a202657008

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Mon, 17 Aug 2015 13:50:54 -0700
parents 8999bac7b84b (current diff) bf696b54ef3a (diff)
children 4260d710d44f
files .hgtags
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Aug 10 14:21:28 2015 -0700
+++ b/.hgtags	Mon Aug 17 13:50:54 2015 -0700
@@ -464,10 +464,16 @@
 bc23767d08cf1e2ba8793106882a3ec9b926d9e0 jdk8u65-b07
 cc1eef73fb58c59317a0be13f31ef7a77b46b8e3 jdk8u65-b08
 db639a8f026b01059114cd32d9e44dfad2b55de0 jdk8u65-b09
+98ad80b71e1fb5c3343c33dffd40e9e92e65f087 jdk8u65-b10
+98ad80b71e1fb5c3343c33dffd40e9e92e65f087 jdk8u65-b10
+0000000000000000000000000000000000000000 jdk8u65-b10
+0000000000000000000000000000000000000000 jdk8u65-b10
+6b5f81fcbdde7bca924364448e7d98912992ac2f jdk8u65-b10
 3a04901d83880634ecd70c8be992189228ccd746 jdk8u66-b00
 3717d70ac87f5e5579e540cd990b4e958c5990a4 jdk8u66-b01
 15851994f9f81f6de37b63683c8cd9b19ae90ed1 jdk8u66-b02
 8e9e5c715064a55865975ec3626b17e0439613c7 jdk8u66-b07
 6802a364b568ce4f4398c0fc90ee0f675337a3c2 jdk8u66-b08
 81d11adaf5aa0b37ffabf45fbeb8fa19f13de596 jdk8u66-b09
+12e44aa2069b20ecbff03285dea4681325b9c05f jdk8u66-b10
 cd1b3e5a3126d0808c845d2df518095b10a98059 jdk8u71-b00
--- a/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties	Mon Aug 10 14:21:28 2015 -0700
+++ b/src/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_pt_BR.properties	Mon Aug 17 13:50:54 2015 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2015, 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
@@ -62,7 +62,7 @@
 
 servertool.list=\n\tlist\n
 servertool.list1=lista todos os servidores registrados
-servertool.list2=\n\tId do Servidor\tNome de Classe do Servidor\t\tAplica\u00E7\u00E3o do Servidor\n\t---------\t-----------------\t\t------------------\n
+servertool.list2=\n\tId do Servidor\tNome de Classe do Servidor\t\tAplicativo do Servidor\n\t---------\t-----------------\t\t------------------\n
 servertool.listactive=\n\tlistactive
 servertool.listactive1=lista os servidores atualmente ativos
 servertool.listappnames=\tlistappnames\n