diff options
| author | Lucas Hazel <lucas@die.net.au> | 2009-03-31 23:05:12 +1100 |
|---|---|---|
| committer | Lucas Hazel <lucas@die.net.au> | 2009-03-31 23:05:47 +1100 |
| commit | 4773c7660183a82168606d2782f698a9bbab56bc (patch) | |
| tree | 8d9c5855dcc2cd64b44a8a9a0cd70fdcbc3e3ae9 /mkvtoolnix | |
| parent | 3b6fa6496ac2801cbb8b4655452cc856f4d81f18 (diff) | |
| download | contrib-4773c7660183a82168606d2782f698a9bbab56bc.tar.gz contrib-4773c7660183a82168606d2782f698a9bbab56bc.tar.xz | |
mkvtoolnix: update to 2.6.0
Diffstat (limited to 'mkvtoolnix')
| -rw-r--r-- | mkvtoolnix/.md5sum | 4 | ||||
| -rw-r--r-- | mkvtoolnix/Pkgfile | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/mkvtoolnix/.md5sum b/mkvtoolnix/.md5sum index 94c5d3d83..95608b0ae 100644 --- a/mkvtoolnix/.md5sum +++ b/mkvtoolnix/.md5sum @@ -1 +1,5 @@ +<<<<<<< Updated upstream:mkvtoolnix/.md5sum de0b41f0dc9b3c7c59a23be4b6e3ee46 mkvtoolnix-2.5.3.tar.bz2 +======= +034e6c4a11b4a9536d250a309c16be85 mkvtoolnix-2.6.0.tar.bz2 +>>>>>>> Stashed changes:mkvtoolnix/.md5sum 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) |