forked from bartvdbraak/blender
== FFMPEG ==
Merge conflict indicators left... arghh.
This commit is contained in:
parent
347df56270
commit
9be8517ca3
5
extern/Makefile
vendored
5
extern/Makefile
vendored
@ -1,9 +1,4 @@
|
||||
#
|
||||
<<<<<<< Makefile
|
||||
# $Id$
|
||||
=======
|
||||
# $Id$
|
||||
>>>>>>> 1.18
|
||||
#
|
||||
# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
|
||||
#
|
||||
|
Loading…
Reference in New Issue
Block a user