summaryrefslogtreecommitdiff
path: root/mkvtoolnix/Pkgfile
diff options
context:
space:
mode:
Diffstat (limited to 'mkvtoolnix/Pkgfile')
-rw-r--r--mkvtoolnix/Pkgfile4
1 files changed, 4 insertions, 0 deletions
diff --git a/mkvtoolnix/Pkgfile b/mkvtoolnix/Pkgfile
index f6aa6d669..0700720fd 100644
--- a/mkvtoolnix/Pkgfile
+++ b/mkvtoolnix/Pkgfile
@@ -5,7 +5,11 @@
# Depends on: libmatroska libvorbis boost
name=mkvtoolnix
+<<<<<<< Updated upstream:mkvtoolnix/Pkgfile
version=2.5.3
+=======
+version=2.6.0
+>>>>>>> Stashed changes:mkvtoolnix/Pkgfile
release=1
source=(http://www.bunkus.org/videotools/mkvtoolnix/sources/$name-$version.tar.bz2)

Generated by cgit