aboutsummaryrefslogtreecommitdiff
path: root/CVSROOT/cvswrappers
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2006-02-16 06:35:23 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2006-02-16 06:35:23 +0000
commit2b5c75b1f6232a785a46de11a9cdc82f3d7b84cf (patch)
tree5ec1cf05868cf8ab0e4acd629db6914d04cd5de2 /CVSROOT/cvswrappers
parentcf727beb76d1e339029e5953a4b4dcdb1310642f (diff)
turned off merging of Pd files
svn path=/trunk/; revision=4590
Diffstat (limited to 'CVSROOT/cvswrappers')
-rw-r--r--CVSROOT/cvswrappers7
1 files changed, 7 insertions, 0 deletions
diff --git a/CVSROOT/cvswrappers b/CVSROOT/cvswrappers
index 056df332..65875700 100644
--- a/CVSROOT/cvswrappers
+++ b/CVSROOT/cvswrappers
@@ -61,6 +61,7 @@
*.mov -k 'b'
*.mpg -k 'b'
*.mpeg -k 'b'
+*.mjpeg -k 'b'
# DOCUMENTS
*.pdf -k 'b'
@@ -81,8 +82,14 @@
# MACOS X FILES
*.pmsp -k 'b'
+# PD FILES
+# pd files can't be meaningfully merged, so copy instead
+# 2006-02-15 <hans@at.or.at>
+*.pd -m 'COPY'
+
# prevent keyword replacement on imported sources
# 2005-05-20 <hans@at.or.at>
portaudio/* -k 'b'
portaudio_osx/* -k 'b'
portaudio_v18/* -k 'b'
+portmidi/* -k 'b'