提交 b466ffbd 编写于 作者: A asaha

Merge

......@@ -635,4 +635,16 @@ fe901996777f50198be2c785cd7e3b8198692bbe jdk8u111-b00
b363f4507ef46d86951d7d00eff4fb6624ebb728 jdk8u111-b02
193aed1bc403b1960fbced8630ac0104f03eb480 jdk8u111-b03
e64a88d7d60f1756fe816f3e996b45433df25434 jdk8u111-b04
58ac6fce1d10c1fba366ad58950a6a54b27a5bcb jdk8u111-b05
8a2538bb35f96ff56a5877fa77119146ad8c11b3 jdk8u111-b06
b4dbbfe1b5fe3e095dc62a25e14688820336a968 jdk8u111-b07
85cd32cbf2c8a66e1ab5470f5d47c8210d9e7c94 jdk8u111-b08
31aca84184b4d54890b4fade1c614927203051b4 jdk8u112-b00
37bd26595d994939ccf98d8c444e692c4fdfff55 jdk8u112-b01
817d9fb584baecae7c989dfd7009a7f0ac7c6360 jdk8u112-b02
d1d3129671c90db26f04ed837e2f105ee9586bef jdk8u112-b03
b2a03d93ed533a0459f27dc109a8be1f7d2f1024 jdk8u112-b04
e1418dc5266e03bf6b06a193da6cdb99ca309f75 jdk8u112-b06
29e1388fa1cafeb05d9c337226c505916c6586b9 jdk8u112-b07
00809b3e07ee374850dd61ade9432b0d9716ebfc jdk8u112-b08
58ac6fce1d10c1fba366ad58950a6a54b27a5bcb jdk8u121-b00
......@@ -3,7 +3,7 @@ The GNU General Public License (GPL)
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies of this license
document, but changing it is not allowed.
......@@ -287,8 +287,8 @@ pointer to where the full notice is found.
more details.
You should have received a copy of the GNU General Public License along
with this program; if not, write to the Free Software Foundation, Inc., 59
Temple Place, Suite 330, Boston, MA 02111-1307 USA
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
......
......@@ -67,7 +67,7 @@ if [ "x$hgwhere" = "x" ]; then
error "Could not locate Mercurial command"
fi
hgversion="`hg --version 2> /dev/null | sed -n -e 's@^Mercurial Distributed SCM (version \([^+]*\).*)\$@\1@p'`"
hgversion="`LANGUAGE=en hg --version 2> /dev/null | sed -n -e 's@^Mercurial Distributed SCM (version \([^+]*\).*)\$@\1@p'`"
if [ "x${hgversion}" = "x" ] ; then
error "Could not determine Mercurial version of $hgwhere"
fi
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册