Author: hibou
Date: Wed Mar 30 21:48:38 2011
New Revision: 1087094
URL: http://svn.apache.org/viewvc?rev=1087094&view=rev
Log:
merge of 1087083
Modified:
ant/ivy/core/branches/2.2.0/ (props changed)
ant/ivy/core/branches/2.2.0/doc/toc.json
Propchange: ant/ivy/core/branches/2.2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 30 21:48:38 2011
@@ -1,4 +1,4 @@
/ant/ivy/core/branches/2.0.0:727187-727188,727520-732505
/ant/ivy/core/branches/2.0.0-rc2:707459-708717
/ant/ivy/core/branches/2.0.x:696803-698317
-/ant/ivy/core/trunk:695737,696014-696031,696442,958415-958693,961017-961020,962767-983820,983827-984586,984952,988337,988678,988691-988707,990621-991115,997391,997508-997517,997711-997931,999129,1000206,1000225,1000257-1000263,1000609
+/ant/ivy/core/trunk:695737,696014-696031,696442,958415-958693,961017-961020,962767-983820,983827-984586,984952,988337,988678,988691-988707,990621-991115,997391,997508-997517,997711-997931,999129,1000206,1000225,1000257-1000263,1000609,1087083
Modified: ant/ivy/core/branches/2.2.0/doc/toc.json
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.2.0/doc/toc.json?rev=1087094&r1=1087093&r2=1087094&view=diff
==============================================================================
--- ant/ivy/core/branches/2.2.0/doc/toc.json (original)
+++ ant/ivy/core/branches/2.2.0/doc/toc.json Wed Mar 30 21:48:38 2011
@@ -401,6 +401,13 @@
]
},
{
+ "id":"settings/signers",
+ "title":"signers",
+ "children": [
+
+ ]
+ },
+ {
"id":"settings/statuses",
"title":"statuses",
"children": [
