Author: antoine
Date: Sun Dec 29 23:27:59 2013
New Revision: 1554094
URL: http://svn.apache.org/r1554094
Log:
merge of cover had to be done with --force and --ignore-ancestry
Modified:
ant/site/ant/production/manual/cover.html (contents, props changed)
Modified: ant/site/ant/production/manual/cover.html
URL:
http://svn.apache.org/viewvc/ant/site/ant/production/manual/cover.html?rev=1554094&r1=1554093&r2=1554094&view=diff
==============================================================================
--- ant/site/ant/production/manual/cover.html (original)
+++ ant/site/ant/production/manual/cover.html Sun Dec 29 23:27:59 2013
@@ -19,14 +19,14 @@
<head>
<meta http-equiv="Content-Language" content="en-us">
<link rel="stylesheet" type="text/css" href="stylesheets/style.css">
-<title>Apache Ant 1.9.2 User Manual</title>
+<title>Apache Ant 1.9.3 User Manual</title>
</head>
<body bgcolor="#FFFFFF">
<div align="center">
<h1><img src="images/ant_logo_large.gif" width="190" height="120"></h1>
- <h1>Apache Ant™ 1.9.2 Manual</h1>
- <p align="left">This is the manual for version 1.9.2 of
+ <h1>Apache Ant™ 1.9.3 Manual</h1>
+ <p align="left">This is the manual for version 1.9.3 of
<a target="_top" href="http://ant.apache.org/index.html">Apache Ant</a>.
If your version
of Ant (as verified with <tt>ant -version</tt>) is older or newer than
this
Propchange: ant/site/ant/production/manual/cover.html
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Dec 29 23:27:59 2013
@@ -0,0 +1,3 @@
+/ant/core/tags/ANT_191/manual/cover.html:1483159-1485178
+/ant/core/tags/ANT_193/manual/cover.html:1553123-1554091
+/ant/core/trunk/manual/cover.html:1084801-1084808,1453159-1553122