[xiph-commits] r6877 - in icecast/branches: . ices-kh libshout-kh

[j at dactyl.lonelymoon.com]

Author: j
Date: Fri Jun 25 13:36:27 2004
New Revision: 6877

Removed:
icecast/branches/timing-shout-kh/
Modified:
icecast/branches/ices-kh/
icecast/branches/libshout-kh/
Log:
merge timing-shout-kh with trunk


Property changes on: icecast/branches/ices-kh
___________________________________________________________________
Name: svn:externals
- m4		http://svn.xiph.org/icecast/trunk/m4
src/log		http://svn.xiph.org/icecast/trunk/log
src/net		http://svn.xiph.org/icecast/branches/net-shout-kh
src/timing	http://svn.xiph.org/icecast/branches/timing-shout-kh
src/thread	http://svn.xiph.org/icecast/branches/thread-shout-kh

+ m4		http://svn.xiph.org/icecast/trunk/m4
src/log		http://svn.xiph.org/icecast/trunk/log
src/net		http://svn.xiph.org/icecast/branches/net-shout-kh
src/timing	http://svn.xiph.org/icecast/trunk/timing
src/thread	http://svn.xiph.org/icecast/branches/thread-shout-kh



Property changes on: icecast/branches/libshout-kh
___________________________________________________________________
Name: svn:externals
- m4              http://svn.xiph.org/icecast/branches/m4-shout-kh
src/avl         http://svn.xiph.org/icecast/trunk/avl
src/httpp       http://svn.xiph.org/icecast/trunk/httpp
src/net         http://svn.xiph.org/icecast/branches/net-shout-kh
src/timing      http://svn.xiph.org/icecast/branches/timing-shout-kh
src/thread      http://svn.xiph.org/icecast/branches/thread-shout-kh

+ m4              http://svn.xiph.org/icecast/branches/m4-shout-kh
src/avl         http://svn.xiph.org/icecast/trunk/avl
src/httpp       http://svn.xiph.org/icecast/trunk/httpp
src/net         http://svn.xiph.org/icecast/branches/net-shout-kh
src/timing      http://svn.xiph.org/icecast/trunk/timing
src/thread      http://svn.xiph.org/icecast/branches/thread-shout-kh