griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

== FFMPEG ==

Browse Source 
Merge conflict indicators left... arghh.
This commit is contained in:
Peter Schlaile
2006-06-25 19:16:45 +00:00
parent 347df56270
commit 9be8517ca3
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extern/Makefile vendored
View File

@@ -1,9 +1,4 @@
#
<<<<<<< Makefile
# $Id$
=======
# $Id$
>>>>>>> 1.18
#
# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
#