Add merge code for the remaining elements in web.xml
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Tue, 10 Nov 2009 00:31:25 +0000 (00:31 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Tue, 10 Nov 2009 00:31:25 +0000 (00:31 +0000)
commit6a4d40450bba22eb81f0e8972a4083b7165d4ccf
tree256677712af607805023bca823994ce01e61d3c3
parent01de87c6ab3058d17ebfd1e4340c7bb5a3b5aa26
Add merge code for the remaining elements in web.xml

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834286 13f79535-47bb-0310-9956-ffa450edef68
java/org/apache/catalina/startup/LocalStrings.properties
java/org/apache/catalina/startup/WebXml.java