summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorVlad Glagolev2019-05-25 15:37:50 +0000
committerVlad Glagolev2019-05-25 15:37:50 +0000
commit4e61d26f634dd5a9b0cebba6486b2b68f6372ba2 (patch)
tree2f1e5e56fd37115504a345fc3b956ee399928afa /video
parentdf5eabb5f195809bb86b70b659e754de5c975517 (diff)
mplayer: correct HISTORY file
Diffstat (limited to 'video')
-rw-r--r--video/mplayer/HISTORY1
1 files changed, 0 insertions, 1 deletions
diff --git a/video/mplayer/HISTORY b/video/mplayer/HISTORY
index dd356c7603..6db6d56b9e 100644
--- a/video/mplayer/HISTORY
+++ b/video/mplayer/HISTORY
@@ -163,7 +163,6 @@
2007-11-21 Arwed v. Merkatz <v.merkatz@gmx.net>
* PRE_BUILD, libavformat-api.patch: fix to support latest ffmpeg-svn
->>>>>>> c9f8f246c7ebcf92c330c4ab45b87ddf334f1c86:video/mplayer/HISTORY
2007-10-18 Arwed v. Merkatz <v.merkatz@gmx.net>
* DEPENDS: removed the MPLAYER_SVN check around the live dependency,