From a0bea44274fb76cc4b2106f97e1f9e48b3d5dee9 Mon Sep 17 00:00:00 2001 From: Carlos Fernandez Date: Mon, 5 Jun 2017 13:20:23 -0700 Subject: [PATCH] Corrected CHANGES.TXT --- docs/CHANGES.TXT | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/docs/CHANGES.TXT b/docs/CHANGES.TXT index 8f613d22..b200e27e 100644 --- a/docs/CHANGES.TXT +++ b/docs/CHANGES.TXT @@ -3,20 +3,16 @@ - Fix: Prevent the OCR being initialized more than once (happened on multiprogram and PAT changes) - New: Added Autoconf build scripts for CCExtractor to generate makefiles (mac). +- New: Added Autoconf build scripts for CCExtractor to generate makefiles (linux). - New: Added .rpm package generation script. - New: Added build/installation script for .pkg.tar.xz (Arch Linux). - New: Added tarball generation script. -<<<<<<< HEAD -- New: Added Autoconf build scripts for CCExtractor to generate makefiles. - New: Added --analyzevideo. If present the video stream will be processed even if the subtitles are in a different stream. This is useful when we want video information (resolution, frame type, etc). -vides now implies this option too. [Note: Tentative - some possibly breaking changed were made for this, so if you use it validate results] -======= -- New: Added Autoconf build scripts for CCExtractor to generate makefiles (linux). - ->>>>>>> pr/n738_techfreakworm + 0.85b (2017-1-26) -----------------