Commit 6003670c authored by giles's avatar giles

Merge recent changes from trunk.

Commits r18358 through r18379.

svn path=/icecast/branches/icecast-webm/; revision=18380
parent 636a2959
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
The win32 port of icecast2 is simply a UI framework around the core icecast2 server. The win32 version of icecast2 directly uses the main executable of icecast (statically included) and simply provides a GUI interface to icecast2. The win32 port of icecast2 is simply a UI framework around the core icecast2 server. The win32 version of icecast2 directly uses the main executable of icecast (statically included) and simply provides a GUI interface to icecast2.
</p> </p>
<p> <p>
Most of the features of icecast2 are available in the win32 port. Most of the features of icecast2 are available in the win32 port. <br />
A notable absence is IPv6 support.
</p> </p>
<h2>Server Status Tab</h2> <h2>Server Status Tab</h2>
<p> <p>
......
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
The win32 port of icecast2 is simply a UI framework around the core icecast2 server. The win32 version of icecast2 uses directly the main executable of icecast (statically included) and simply provides a nicer, friendlier interface to icecast2. The win32 port of icecast2 is simply a UI framework around the core icecast2 server. The win32 version of icecast2 uses directly the main executable of icecast (statically included) and simply provides a nicer, friendlier interface to icecast2.
</p> </p>
<p> <p>
All of the features of icecast2 are available in the win32 port. Most of the features of icecast2 are available in the win32 port. <br />
A notable absence is IPv6 support.
</p> </p>
</div> </div>
</body> </body>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<td align="right"> <td align="right">
<a href="{@mount}.m3u">M3U</a> <a href="{@mount}.m3u">M3U</a>
<a href="{@mount}.xspf">XSPF</a> <a href="{@mount}.xspf">XSPF</a>
<a href="{@mount}.vclt">VCLT</a> <!-- <a href="{@mount}.vclt">VCLT</a> -->
</td> </td>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment