Merge from 1.1.

--HG--
rename : src/libxineadec/nsf.c => src/combined/nsf_decoder.c
rename : src/demuxers/demux_nsf.c => src/combined/nsf_demuxer.c
rename : src/combined/combined_wavpack.c => src/combined/wavpack_combined.c
rename : src/combined/combined_wavpack.h => src/combined/wavpack_combined.h
rename : src/combined/decoder_wavpack.c => src/combined/wavpack_decoder.c
rename : src/combined/demux_wavpack.c => src/combined/wavpack_demuxer.c
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
rename : src/libxineadec/xine_speex_decoder.c => src/combined/xine_speex_decoder.c
rename : src/libxinevdec/xine_theora_decoder.c => src/combined/xine_theora_decoder.c
rename : src/libxineadec/xine_vorbis_decoder.c => src/combined/xine_vorbis_decoder.c
rename : src/liba52/xine_a52_decoder.c => src/libxineadec/xine_a52_decoder.c
rename : src/libdts/xine_dts_decoder.c => src/libxineadec/xine_dts_decoder.c
rename : src/libfaad/xine_faad_decoder.c => src/libxineadec/xine_faad_decoder.c
rename : src/libmad/xine_mad_decoder.c => src/libxineadec/xine_mad_decoder.c
rename : src/libmusepack/xine_musepack_decoder.c => src/libxineadec/xine_musepack_decoder.c

6 files changed, 0 insertions, 28 deletions

diff --git a/doc/README.dxr3 b/doc/README.dxr3
index db1e97585..41fe9ad74 100644
--- a/doc/README.dxr3
+++ b/doc/README.dxr3
@@ -183,8 +183,3 @@ prefer, of course).
 
 Have a look at the previous explained configuration options dxr3.output.keycolor
 and dxr3.output.keycolor_interval too.
-
-
---- 
-version of this file:
- $Id: README.dxr3,v 1.11 2004/12/12 22:00:47 mroi Exp $
diff --git a/doc/README.freebsd b/doc/README.freebsd
index 7ef1918b4..900f60aa1 100644
--- a/doc/README.freebsd
+++ b/doc/README.freebsd
@@ -108,9 +108,3 @@ v4l on freebsd
 For building v4l plugins you will need install v4l_compat package.
 
 ------------------------------------------------------------------------
-
-
-
---- 
-version of this file:
- $Id: README.freebsd,v 1.7 2006/10/16 22:09:32 valtri Exp $
diff --git a/doc/README.network_dvd b/doc/README.network_dvd
index b64916190..4798b79f8 100644
--- a/doc/README.network_dvd
+++ b/doc/README.network_dvd
@@ -135,7 +135,3 @@ dvd commands:
 
   dvd_title <block>
   <error code> 0
-
----
-version of this file:
- $Id: README.network_dvd,v 1.3 2004/12/12 22:00:48 mroi Exp $
diff --git a/doc/README.solaris b/doc/README.solaris
index dbc9d8743..9e78287a9 100644
--- a/doc/README.solaris
+++ b/doc/README.solaris
@@ -129,8 +129,3 @@ Known Problems
   See the following message for more details about this bug:
 
 	http://groups.yahoo.com/group/solarisonintel/message/22516
-
-
---- 
-version of this file:
- $Id: README.solaris,v 1.14 2004/06/19 14:51:31 komadori Exp $
diff --git a/doc/README.syncfb b/doc/README.syncfb
index 1adfb8bfd..fc90ff586 100644
--- a/doc/README.syncfb
+++ b/doc/README.syncfb
@@ -4,10 +4,6 @@
   =====                                                               =====
 
 
-   VERSION
-    => $Id: README.syncfb,v 1.4 2006/11/30 08:45:51 matt2000 Exp $
-  
-
 * WHAT IS THIS PLUGIN ABOUT and WHY SHOULD I EVEN CONSIDER TO USE IT? :)
   
   This xine video output plugin uses the so called  SyncFB  driver (from
diff --git a/doc/hackersguide/README b/doc/hackersguide/README
index f8c17e89c..c0c0d944a 100644
--- a/doc/hackersguide/README
+++ b/doc/hackersguide/README
@@ -39,7 +39,3 @@ building the hackersguide.html
 ------------------------------
 
 The easy way to build everything is to issue a "make docs" here.
-
---- 
-version of this file:
- $Id: README,v 1.3 2003/10/12 19:06:43 mroi Exp $