Author: violetagg
Date: Tue Oct 22 00:00:04 2013
New Revision: 1534419
URL: http://svn.apache.org/r1534419
Log:
Merged revision 1534418 from tomcat/trunk:
Removed the extra line-ending information in the files.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/res/META-INF/tomcat7-websocket.jar/services/javax.servlet.ServletContainerInitializer
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1534418
Modified:
tomcat/tc7.0.x/trunk/res/META-INF/tomcat7-websocket.jar/services/javax.servlet.ServletContainerInitializer
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/META-INF/tomcat7-websocket.jar/services/javax.servlet.ServletContainerInitializer?rev=1534419&r1=1534418&r2=1534419&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/res/META-INF/tomcat7-websocket.jar/services/javax.servlet.ServletContainerInitializer
(original)
+++
tomcat/tc7.0.x/trunk/res/META-INF/tomcat7-websocket.jar/services/javax.servlet.ServletContainerInitializer
Tue Oct 22 00:00:04 2013
@@ -1 +1 @@
-org.apache.tomcat.websocket.server.WsSci
+org.apache.tomcat.websocket.server.WsSci
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
