[PD-cvs] CVSROOT cvswrappers,1.5,1.6

[Hans-Christoph Steiner]

Update of /cvsroot/pure-data/CVSROOT
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25210

Modified Files:
	cvswrappers 
Log Message:
turned off merging of Pd files

Index: cvswrappers
===================================================================
RCS file: /cvsroot/pure-data/CVSROOT/cvswrappers,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** cvswrappers	25 May 2005 06:29:02 -0000	1.5
--- cvswrappers	16 Feb 2006 06:35:23 -0000	1.6
***************
*** 62,65 ****
--- 62,66 ----
  *.mpg -k 'b'
  *.mpeg -k 'b'
+ *.mjpeg -k 'b'
  
  # DOCUMENTS
***************
*** 82,85 ****
--- 83,91 ----
  *.pmsp -k 'b'
  
+ # PD FILES
+ # pd files can't be meaningfully merged, so copy instead
+ # 2006-02-15 <hans at at.or.at>
+ *.pd -m 'COPY'
+ 
  # prevent keyword replacement on imported sources
  # 2005-05-20 <hans at at.or.at>
***************
*** 87,88 ****
--- 93,95 ----
  portaudio_osx/* -k 'b'
  portaudio_v18/* -k 'b'
+ portmidi/* -k 'b'