aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2025-02-02 15:07:36 -05:00
Code

Merge recent changes from trunk.

Browse Source 
Commits r18358 through r18379.

svn path=/icecast/branches/icecast-webm/; revision=18380
This commit is contained in:
giles 2012-06-12 23:53:40 +00:00
parent 636a2959f3
commit 6003670c96
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/icecast2_win32.html
View File

@ -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>

3
doc/index_win32.html
View File

@ -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>

2
web/status.xsl
View File

@ -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>