diff options
| author | Peter Schlaile <peter@schlaile.de> | 2006-06-25 23:16:45 +0400 |
|---|---|---|
| committer | Peter Schlaile <peter@schlaile.de> | 2006-06-25 23:16:45 +0400 |
| commit | 9be8517ca3c417fe09b74992b28c2348cb4a0b1f (patch) | |
| tree | 7bda159d2367685108ece4b8175c87f096080888 /extern/Makefile | |
| parent | 347df562703ae9b01e73ec2c5526e987e389a815 (diff) | |
== FFMPEG ==
Merge conflict indicators left... arghh.
Diffstat (limited to 'extern/Makefile')
| -rw-r--r-- | extern/Makefile | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/extern/Makefile b/extern/Makefile index c7d6c647457..766f7f34d92 100644 --- a/extern/Makefile +++ b/extern/Makefile @@ -1,9 +1,4 @@ -# -<<<<<<< Makefile -# $Id$ -======= # $Id$ ->>>>>>> 1.18 # # ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** # |