diff --git a/ChangeLog b/ChangeLog index b6483dc4f..5335c9201 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2013-12-01 Moritz Bunkus + * Released v6.6.0. + * mmg: new feature: implemented drag & drop in the chapter editor. Implements #929. diff --git a/README b/README index eae631800..4f87346d3 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -MKVToolNix 6.5.0 +MKVToolNix 6.6.0 ================ Table of contents diff --git a/README.Windows.txt b/README.Windows.txt index c9545422a..f6d260f96 100644 --- a/README.Windows.txt +++ b/README.Windows.txt @@ -1,4 +1,4 @@ -Building MKVToolNix 6.5.0 on Windows +Building MKVToolNix 6.6.0 on Windows ==================================== There is currently only one supported way to build MKVToolNix for diff --git a/configure.in b/configure.in index abbb19e9a..099e0c798 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ AC_PREREQ(2.50) AC_CONFIG_HEADERS(config.h:config.h.in) PACKAGE="mkvtoolnix" -VERSION="6.5.0" +VERSION="6.6.0" AC_SUBST(PACKAGE) AC_SUBST(VERSION) diff --git a/contrib/centos.spec b/contrib/centos.spec index 4e079d60f..571d6783e 100644 --- a/contrib/centos.spec +++ b/contrib/centos.spec @@ -7,7 +7,7 @@ Summary: mkvtoolnix Name: mkvtoolnix -Version: 6.5.0 +Version: 6.6.0 Release: 1 License: GPL Group: Multimedia diff --git a/contrib/fedora-core.spec b/contrib/fedora-core.spec index e312447dd..dc2cf2099 100644 --- a/contrib/fedora-core.spec +++ b/contrib/fedora-core.spec @@ -2,7 +2,7 @@ Summary: mkvtoolnix Name: mkvtoolnix -Version: 6.5.0 +Version: 6.6.0 Release: 1 License: GPL Group: Multimedia diff --git a/contrib/opensuse-12.spec b/contrib/opensuse-12.spec index 80990ef33..3f7083995 100644 --- a/contrib/opensuse-12.spec +++ b/contrib/opensuse-12.spec @@ -7,7 +7,7 @@ BuildRequires: flac flac-devel gcc-c++ gtk2 gtk2-devel libogg0 libogg-devel libs Name: mkvtoolnix URL: http://www.bunkus.org/videotools/mkvtoolnix/ -Version: 6.5.0 +Version: 6.6.0 Release: 1 Summary: tools to create, alter and inspect Matroska files License: GPL diff --git a/debian-upstream/changelog b/debian-upstream/changelog index a97269499..59143251f 100644 --- a/debian-upstream/changelog +++ b/debian-upstream/changelog @@ -1,3 +1,9 @@ +mkvtoolnix (6.6.0) saucy; urgency=low + + * New version. + + -- Moritz Bunkus Sun, 01 Dec 2013 17:50:00 +0100 + mkvtoolnix (6.5.0) saucy; urgency=low * New version. diff --git a/doc/man/de/mkvextract.1 b/doc/man/de/mkvextract.1 index d8fa6b1a3..6ab582304 100644 --- a/doc/man/de/mkvextract.1 +++ b/doc/man/de/mkvextract.1 @@ -2,12 +2,12 @@ .\" Title: mkvextract .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: Benutzerbefehle -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: German .\" -.TH "MKVEXTRACT" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "Benutzerbefehle" +.TH "MKVEXTRACT" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "Benutzerbefehle" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/de/mkvinfo.1 b/doc/man/de/mkvinfo.1 index 1b1fa44d9..3febc4241 100644 --- a/doc/man/de/mkvinfo.1 +++ b/doc/man/de/mkvinfo.1 @@ -2,12 +2,12 @@ .\" Title: mkvinfo .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: Benutzerbefehle -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: German .\" -.TH "MKVINFO" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "Benutzerbefehle" +.TH "MKVINFO" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "Benutzerbefehle" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/de/mkvmerge.1 b/doc/man/de/mkvmerge.1 index 8ea1ba7ea..1ef7954a2 100644 --- a/doc/man/de/mkvmerge.1 +++ b/doc/man/de/mkvmerge.1 @@ -2,12 +2,12 @@ .\" Title: mkvmerge .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: Benutzerbefehle -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: German .\" -.TH "MKVMERGE" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "Benutzerbefehle" +.TH "MKVMERGE" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "Benutzerbefehle" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/de/mkvpropedit.1 b/doc/man/de/mkvpropedit.1 index 5171110f7..f4e33e9d1 100644 --- a/doc/man/de/mkvpropedit.1 +++ b/doc/man/de/mkvpropedit.1 @@ -2,12 +2,12 @@ .\" Title: mkvpropedit .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: Benutzerbefehle -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: German .\" -.TH "MKVPROPEDIT" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "Benutzerbefehle" +.TH "MKVPROPEDIT" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "Benutzerbefehle" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/de/mmg.1 b/doc/man/de/mmg.1 index af049bfc5..b231530f4 100644 --- a/doc/man/de/mmg.1 +++ b/doc/man/de/mmg.1 @@ -2,12 +2,12 @@ .\" Title: mmg .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: Benutzerbefehle -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: German .\" -.TH "MMG" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "Benutzerbefehle" +.TH "MMG" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "Benutzerbefehle" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/ja/mkvextract.1 b/doc/man/ja/mkvextract.1 index 443bb2e29..d5a8cf19b 100644 --- a/doc/man/ja/mkvextract.1 +++ b/doc/man/ja/mkvextract.1 @@ -2,12 +2,12 @@ .\" Title: mkvextract .\" Author: Bunkus Moritz[FAMILY Given] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Japanese .\" -.TH "MKVEXTRACT" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "" +.TH "MKVEXTRACT" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/ja/mkvinfo.1 b/doc/man/ja/mkvinfo.1 index c8ecb5309..f95d9986d 100644 --- a/doc/man/ja/mkvinfo.1 +++ b/doc/man/ja/mkvinfo.1 @@ -2,12 +2,12 @@ .\" Title: mkvinfo .\" Author: Bunkus Moritz[FAMILY Given] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Japanese .\" -.TH "MKVINFO" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "" +.TH "MKVINFO" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/ja/mkvmerge.1 b/doc/man/ja/mkvmerge.1 index 65a69ebfb..d57d723ab 100644 --- a/doc/man/ja/mkvmerge.1 +++ b/doc/man/ja/mkvmerge.1 @@ -2,12 +2,12 @@ .\" Title: mkvmerge .\" Author: Bunkus Moritz[FAMILY Given] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Japanese .\" -.TH "MKVMERGE" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "" +.TH "MKVMERGE" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/ja/mkvpropedit.1 b/doc/man/ja/mkvpropedit.1 index 15fe3cc07..c40b946e0 100644 --- a/doc/man/ja/mkvpropedit.1 +++ b/doc/man/ja/mkvpropedit.1 @@ -2,12 +2,12 @@ .\" Title: mkvpropedit .\" Author: Bunkus Moritz[FAMILY Given] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Japanese .\" -.TH "MKVPROPEDIT" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "" +.TH "MKVPROPEDIT" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/ja/mmg.1 b/doc/man/ja/mmg.1 index 512de8c9a..3e5972461 100644 --- a/doc/man/ja/mmg.1 +++ b/doc/man/ja/mmg.1 @@ -2,12 +2,12 @@ .\" Title: mmg .\" Author: Bunkus Moritz[FAMILY Given] .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Japanese .\" -.TH "MMG" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "" +.TH "MMG" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/mkvextract.1 b/doc/man/mkvextract.1 index 4090232a6..d6170cf2d 100644 --- a/doc/man/mkvextract.1 +++ b/doc/man/mkvextract.1 @@ -2,12 +2,12 @@ .\" Title: mkvextract .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: User Commands -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: English .\" -.TH "MKVEXTRACT" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "User Commands" +.TH "MKVEXTRACT" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/mkvextract.xml b/doc/man/mkvextract.xml index a1501e4ca..f5944df1d 100644 --- a/doc/man/mkvextract.xml +++ b/doc/man/mkvextract.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mkvinfo.1 b/doc/man/mkvinfo.1 index 901df1444..98419123e 100644 --- a/doc/man/mkvinfo.1 +++ b/doc/man/mkvinfo.1 @@ -2,12 +2,12 @@ .\" Title: mkvinfo .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: User Commands -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: English .\" -.TH "MKVINFO" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "User Commands" +.TH "MKVINFO" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/mkvinfo.xml b/doc/man/mkvinfo.xml index b4a905342..7443c288a 100644 --- a/doc/man/mkvinfo.xml +++ b/doc/man/mkvinfo.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mkvmerge.1 b/doc/man/mkvmerge.1 index 65eca9ae1..e50173015 100644 --- a/doc/man/mkvmerge.1 +++ b/doc/man/mkvmerge.1 @@ -2,12 +2,12 @@ .\" Title: mkvmerge .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: User Commands -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: English .\" -.TH "MKVMERGE" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "User Commands" +.TH "MKVMERGE" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/mkvmerge.xml b/doc/man/mkvmerge.xml index d780ce70b..25ceb53fd 100644 --- a/doc/man/mkvmerge.xml +++ b/doc/man/mkvmerge.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mkvpropedit.1 b/doc/man/mkvpropedit.1 index 00f2f557e..564889716 100644 --- a/doc/man/mkvpropedit.1 +++ b/doc/man/mkvpropedit.1 @@ -2,12 +2,12 @@ .\" Title: mkvpropedit .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: User Commands -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: English .\" -.TH "MKVPROPEDIT" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "User Commands" +.TH "MKVPROPEDIT" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/mkvpropedit.xml b/doc/man/mkvpropedit.xml index 8a38d2653..5b596d152 100644 --- a/doc/man/mkvpropedit.xml +++ b/doc/man/mkvpropedit.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mkvtoolnix-gui.xml b/doc/man/mkvtoolnix-gui.xml index 2d8de98c2..b75a73183 100644 --- a/doc/man/mkvtoolnix-gui.xml +++ b/doc/man/mkvtoolnix-gui.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/mmg.1 b/doc/man/mmg.1 index a9fb547be..412a3b6f4 100644 --- a/doc/man/mmg.1 +++ b/doc/man/mmg.1 @@ -2,12 +2,12 @@ .\" Title: mmg .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: User Commands -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: English .\" -.TH "MMG" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "User Commands" +.TH "MMG" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/mmg.xml b/doc/man/mmg.xml index 0e91ed20a..f4a65eb71 100644 --- a/doc/man/mmg.xml +++ b/doc/man/mmg.xml @@ -3,8 +3,8 @@ - - + + mkvmerge1"> mkvinfo1"> diff --git a/doc/man/nl/mkvextract.1 b/doc/man/nl/mkvextract.1 index f212d6903..b83d093a5 100644 --- a/doc/man/nl/mkvextract.1 +++ b/doc/man/nl/mkvextract.1 @@ -2,12 +2,12 @@ .\" Title: mkvextract .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: Gebruiker commando\*(Aqs -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Dutch .\" -.TH "MKVEXTRACT" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "Gebruiker commando\*(Aqs" +.TH "MKVEXTRACT" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "Gebruiker commando\*(Aqs" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/nl/mkvinfo.1 b/doc/man/nl/mkvinfo.1 index 7d2bcec56..d22f29757 100644 --- a/doc/man/nl/mkvinfo.1 +++ b/doc/man/nl/mkvinfo.1 @@ -2,12 +2,12 @@ .\" Title: mkvinfo .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: Gebruiker commando\*(Aqs -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Dutch .\" -.TH "MKVINFO" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "Gebruiker commando\*(Aqs" +.TH "MKVINFO" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "Gebruiker commando\*(Aqs" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/nl/mkvmerge.1 b/doc/man/nl/mkvmerge.1 index adf07b04d..8ed3cdc7f 100644 --- a/doc/man/nl/mkvmerge.1 +++ b/doc/man/nl/mkvmerge.1 @@ -2,12 +2,12 @@ .\" Title: mkvmerge .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: Gebruiker commando\*(Aqs -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Dutch .\" -.TH "MKVMERGE" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "Gebruiker commando\*(Aqs" +.TH "MKVMERGE" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "Gebruiker commando\*(Aqs" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/nl/mkvpropedit.1 b/doc/man/nl/mkvpropedit.1 index a4f75d158..36a974485 100644 --- a/doc/man/nl/mkvpropedit.1 +++ b/doc/man/nl/mkvpropedit.1 @@ -2,12 +2,12 @@ .\" Title: mkvpropedit .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: Gebruiker commando\*(Aqs -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Dutch .\" -.TH "MKVPROPEDIT" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "Gebruiker commando\*(Aqs" +.TH "MKVPROPEDIT" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "Gebruiker commando\*(Aqs" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/nl/mmg.1 b/doc/man/nl/mmg.1 index ffce80d5d..7155c5fa3 100644 --- a/doc/man/nl/mmg.1 +++ b/doc/man/nl/mmg.1 @@ -2,12 +2,12 @@ .\" Title: mmg .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: Gebruiker commando\*(Aqs -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Dutch .\" -.TH "MMG" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "Gebruiker commando\*(Aqs" +.TH "MMG" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "Gebruiker commando\*(Aqs" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/po4a/po/de.po b/doc/man/po4a/po/de.po index dc945a48a..2f85276e3 100644 --- a/doc/man/po4a/po/de.po +++ b/doc/man/po4a/po/de.po @@ -24,8 +24,8 @@ msgstr "mkvextract" #. type: Content of the version entity #: doc/man/mkvextract.xml:6 doc/man/mkvinfo.xml:6 doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 doc/man/mmg.xml:6 -msgid "6.5.0" -msgstr "6.5.0" +msgid "6.6.0" +msgstr "6.6.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 doc/man/mkvinfo.xml:7 doc/man/mkvmerge.xml:7 diff --git a/doc/man/po4a/po/ja.po b/doc/man/po4a/po/ja.po index a7cbfc676..f5a39546a 100644 --- a/doc/man/po4a/po/ja.po +++ b/doc/man/po4a/po/ja.po @@ -23,8 +23,8 @@ msgstr "mkvextract" #. type: Content of the version entity #: doc/man/mkvextract.xml:6 doc/man/mkvinfo.xml:6 doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 doc/man/mmg.xml:6 -msgid "6.5.0" -msgstr "6.5.0" +msgid "6.6.0" +msgstr "6.6.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 doc/man/mkvinfo.xml:7 doc/man/mkvmerge.xml:7 diff --git a/doc/man/po4a/po/nl.po b/doc/man/po4a/po/nl.po index 3e1c54b92..458d2d8b9 100644 --- a/doc/man/po4a/po/nl.po +++ b/doc/man/po4a/po/nl.po @@ -26,8 +26,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mmg.xml:6 -msgid "6.5.0" -msgstr "6.5.0" +msgid "6.6.0" +msgstr "6.6.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/doc/man/po4a/po/uk.po b/doc/man/po4a/po/uk.po index 33c75d8ee..a183955c7 100644 --- a/doc/man/po4a/po/uk.po +++ b/doc/man/po4a/po/uk.po @@ -24,8 +24,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mmg.xml:6 -msgid "6.5.0" -msgstr "6.5.0" +msgid "6.6.0" +msgstr "6.6.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/doc/man/po4a/po/zh_CN.po b/doc/man/po4a/po/zh_CN.po index f88028473..9a3579917 100644 --- a/doc/man/po4a/po/zh_CN.po +++ b/doc/man/po4a/po/zh_CN.po @@ -27,8 +27,8 @@ msgstr "mkvextract" #: doc/man/mkvmerge.xml:6 #: doc/man/mkvpropedit.xml:6 #: doc/man/mmg.xml:6 -msgid "6.5.0" -msgstr "6.5.0" +msgid "6.6.0" +msgstr "6.6.0" #. type: Content of the date entity #: doc/man/mkvextract.xml:7 diff --git a/doc/man/uk/mkvextract.1 b/doc/man/uk/mkvextract.1 index b930f8e53..7b16d2845 100644 --- a/doc/man/uk/mkvextract.1 +++ b/doc/man/uk/mkvextract.1 @@ -2,12 +2,12 @@ .\" Title: mkvextract .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: Користувацькі команди -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Ukrainian .\" -.TH "mkvextract" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "Користувацькі команди" +.TH "mkvextract" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "Користувацькі команди" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/uk/mkvinfo.1 b/doc/man/uk/mkvinfo.1 index 5a5c1e4b3..fe435fa2a 100644 --- a/doc/man/uk/mkvinfo.1 +++ b/doc/man/uk/mkvinfo.1 @@ -2,12 +2,12 @@ .\" Title: mkvinfo .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: Користувацькі команди -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Ukrainian .\" -.TH "mkvinfo" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "Користувацькі команди" +.TH "mkvinfo" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "Користувацькі команди" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/uk/mkvmerge.1 b/doc/man/uk/mkvmerge.1 index b478ae2b6..f5607b8dc 100644 --- a/doc/man/uk/mkvmerge.1 +++ b/doc/man/uk/mkvmerge.1 @@ -2,12 +2,12 @@ .\" Title: mkvmerge .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: Користувацькі команди -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Ukrainian .\" -.TH "mkvmerge" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "Користувацькі команди" +.TH "mkvmerge" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "Користувацькі команди" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/uk/mkvpropedit.1 b/doc/man/uk/mkvpropedit.1 index 91d6ca35a..b8ad5394a 100644 --- a/doc/man/uk/mkvpropedit.1 +++ b/doc/man/uk/mkvpropedit.1 @@ -2,12 +2,12 @@ .\" Title: mkvpropedit .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: Користувацькі команди -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Ukrainian .\" -.TH "mkvpropedit" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "Користувацькі команди" +.TH "mkvpropedit" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "Користувацькі команди" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/uk/mmg.1 b/doc/man/uk/mmg.1 index 9b0033c79..9e7346af2 100644 --- a/doc/man/uk/mmg.1 +++ b/doc/man/uk/mmg.1 @@ -2,12 +2,12 @@ .\" Title: mmg .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: Користувацькі команди -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Ukrainian .\" -.TH "mmg" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "Користувацькі команди" +.TH "mmg" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "Користувацькі команди" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/zh_CN/mkvextract.1 b/doc/man/zh_CN/mkvextract.1 index 32d9016f8..67a12950b 100644 --- a/doc/man/zh_CN/mkvextract.1 +++ b/doc/man/zh_CN/mkvextract.1 @@ -2,12 +2,12 @@ .\" Title: mkvextract .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: 用户命令 -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Chinese .\" -.TH "MKVEXTRACT" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "用户命令" +.TH "MKVEXTRACT" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "用户命令" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/zh_CN/mkvinfo.1 b/doc/man/zh_CN/mkvinfo.1 index 97cc573dd..6e8204da5 100644 --- a/doc/man/zh_CN/mkvinfo.1 +++ b/doc/man/zh_CN/mkvinfo.1 @@ -2,12 +2,12 @@ .\" Title: mkvinfo .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: 用户命令 -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Chinese .\" -.TH "MKVINFO" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "用户命令" +.TH "MKVINFO" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "用户命令" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/zh_CN/mkvmerge.1 b/doc/man/zh_CN/mkvmerge.1 index ab0e8312b..164f16bf6 100644 --- a/doc/man/zh_CN/mkvmerge.1 +++ b/doc/man/zh_CN/mkvmerge.1 @@ -2,12 +2,12 @@ .\" Title: mkvmerge .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: 用户命令 -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Chinese .\" -.TH "MKVMERGE" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "用户命令" +.TH "MKVMERGE" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "用户命令" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/zh_CN/mkvpropedit.1 b/doc/man/zh_CN/mkvpropedit.1 index 5a601aa46..c8e333fa9 100644 --- a/doc/man/zh_CN/mkvpropedit.1 +++ b/doc/man/zh_CN/mkvpropedit.1 @@ -2,12 +2,12 @@ .\" Title: mkvpropedit .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: 用户命令 -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Chinese .\" -.TH "MKVPROPEDIT" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "用户命令" +.TH "MKVPROPEDIT" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "用户命令" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/doc/man/zh_CN/mmg.1 b/doc/man/zh_CN/mmg.1 index 48a2b1a3d..29f16fdbe 100644 --- a/doc/man/zh_CN/mmg.1 +++ b/doc/man/zh_CN/mmg.1 @@ -2,12 +2,12 @@ .\" Title: mmg .\" Author: Moritz Bunkus .\" Generator: DocBook XSL Stylesheets v1.78.1 -.\" Date: 2013-10-19 +.\" Date: 2013-12-01 .\" Manual: 用户命令 -.\" Source: MKVToolNix 6.5.0 +.\" Source: MKVToolNix 6.6.0 .\" Language: Chinese .\" -.TH "MMG" "1" "2013\-10\-19" "MKVToolNix 6\&.5\&.0" "用户命令" +.TH "MMG" "1" "2013\-12\-01" "MKVToolNix 6\&.6\&.0" "用户命令" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/installer/mkvtoolnix-unicode.nsi b/installer/mkvtoolnix-unicode.nsi index baa1bd321..6e2e23921 100644 --- a/installer/mkvtoolnix-unicode.nsi +++ b/installer/mkvtoolnix-unicode.nsi @@ -1,5 +1,5 @@ !define PRODUCT_NAME "MKVToolNix" -!define PRODUCT_VERSION "6.5.0" +!define PRODUCT_VERSION "6.6.0" !define PRODUCT_VERSION_BUILD "" # Intentionally left empty for releases !define PRODUCT_PUBLISHER "Moritz Bunkus" !define PRODUCT_WEB_SITE "http://www.bunkus.org/videotools/mkvtoolnix/" diff --git a/src/common/version.cpp b/src/common/version.cpp index cdc7ca45c..5122f6beb 100644 --- a/src/common/version.cpp +++ b/src/common/version.cpp @@ -25,7 +25,7 @@ #include "common/strings/parsing.h" #include "common/version.h" -#define VERSIONNAME "Isn't she lovely" +#define VERSIONNAME "The Edge Of The In Between" version_number_t::version_number_t() : valid(false) diff --git a/src/extract/resources.rc b/src/extract/resources.rc index 1228e5ab5..cec15f42e 100644 --- a/src/extract/resources.rc +++ b/src/extract/resources.rc @@ -1,8 +1,8 @@ mkvextract ICON "../../share/icons/windows/mkvextract.ico" 1 VERSIONINFO - FILEVERSION 6, 5, 0, 0 - PRODUCTVERSION 6, 5, 0, 0 + FILEVERSION 6, 6, 0, 0 + PRODUCTVERSION 6, 6, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -12,12 +12,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvextract" - VALUE "FileVersion", "6.5.0" + VALUE "FileVersion", "6.6.0" VALUE "InternalName", "mkvextract" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mkvextract" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "6.5.0" + VALUE "ProductVersion", "6.6.0" END END BLOCK "VarFileInfo" diff --git a/src/info/resources.rc b/src/info/resources.rc index eac087632..957ec0e31 100644 --- a/src/info/resources.rc +++ b/src/info/resources.rc @@ -6,8 +6,8 @@ mkvinfo ICON "../../share/icons/windows/mkvinfo.ico" #endif 1 VERSIONINFO - FILEVERSION 6, 5, 0, 0 - PRODUCTVERSION 6, 5, 0, 0 + FILEVERSION 6, 6, 0, 0 + PRODUCTVERSION 6, 6, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -17,12 +17,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvinfo" - VALUE "FileVersion", "6.5.0" + VALUE "FileVersion", "6.6.0" VALUE "InternalName", "mkvinfo" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mkvinfo" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "6.5.0" + VALUE "ProductVersion", "6.6.0" END END BLOCK "VarFileInfo" diff --git a/src/merge/resources.rc b/src/merge/resources.rc index 1680b315a..03b6fb6cf 100644 --- a/src/merge/resources.rc +++ b/src/merge/resources.rc @@ -1,8 +1,8 @@ MATROSKAICON ICON "../../share/icons/windows/mkvmerge.ico" 1 VERSIONINFO - FILEVERSION 6, 5, 0, 0 - PRODUCTVERSION 6, 5, 0, 0 + FILEVERSION 6, 6, 0, 0 + PRODUCTVERSION 6, 6, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -12,12 +12,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvmerge" - VALUE "FileVersion", "6.5.0" + VALUE "FileVersion", "6.6.0" VALUE "InternalName", "mkvmerge" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mkvmerge" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "6.5.0" + VALUE "ProductVersion", "6.6.0" END END BLOCK "VarFileInfo" diff --git a/src/mkvtoolnix-gui/resources.rc b/src/mkvtoolnix-gui/resources.rc index afe0a0e89..07115c414 100644 --- a/src/mkvtoolnix-gui/resources.rc +++ b/src/mkvtoolnix-gui/resources.rc @@ -3,8 +3,8 @@ mkvmergeGUI ICON "../../share/icons/windows/mkvmergeGUI.ico" #define wxUSE_NO_MANIFEST 1 1 VERSIONINFO - FILEVERSION 6, 5, 0, 0 - PRODUCTVERSION 6, 5, 0, 0 + FILEVERSION 6, 6, 0, 0 + PRODUCTVERSION 6, 6, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -14,12 +14,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvtoolnix-gui" - VALUE "FileVersion", "6.5.0" + VALUE "FileVersion", "6.6.0" VALUE "InternalName", "mkvtoolnix-gui" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mkvtoolnix-gui" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "6.5.0" + VALUE "ProductVersion", "6.6.0" END END BLOCK "VarFileInfo" diff --git a/src/mmg/resources.rc b/src/mmg/resources.rc index aa95b5ac4..f9a81367a 100644 --- a/src/mmg/resources.rc +++ b/src/mmg/resources.rc @@ -4,8 +4,8 @@ mkvmergeGUI ICON "../../share/icons/windows/mkvmergeGUI.ico" #include "wx/msw/wx.rc" 1 VERSIONINFO - FILEVERSION 6, 5, 0, 0 - PRODUCTVERSION 6, 5, 0, 0 + FILEVERSION 6, 6, 0, 0 + PRODUCTVERSION 6, 6, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -15,12 +15,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mmg" - VALUE "FileVersion", "6.5.0" + VALUE "FileVersion", "6.6.0" VALUE "InternalName", "mmg" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mmg" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "6.5.0" + VALUE "ProductVersion", "6.6.0" END END BLOCK "VarFileInfo" diff --git a/src/propedit/resources.rc b/src/propedit/resources.rc index ff91ddf22..b6b2dd283 100644 --- a/src/propedit/resources.rc +++ b/src/propedit/resources.rc @@ -1,8 +1,8 @@ mkvpropedit ICON "../../share/icons/windows/mkvpropedit.ico" 1 VERSIONINFO - FILEVERSION 6, 5, 0, 0 - PRODUCTVERSION 6, 5, 0, 0 + FILEVERSION 6, 6, 0, 0 + PRODUCTVERSION 6, 6, 0, 0 FILEFLAGSMASK 0x3f FILEOS 0x4 BEGIN @@ -12,12 +12,12 @@ BEGIN BEGIN VALUE "CompanyName", "Moritz Bunkus" VALUE "FileDescription", "mkvpropedit" - VALUE "FileVersion", "6.5.0" + VALUE "FileVersion", "6.6.0" VALUE "InternalName", "mkvpropedit" VALUE "LegalCopyright", "Released under the GNU Pulic License http://www.gnu.org/licenses/gpl-2.0.html" VALUE "OriginalFilename", "mkvpropedit" VALUE "ProductName", "MKVToolNix" - VALUE "ProductVersion", "6.5.0" + VALUE "ProductVersion", "6.6.0" END END BLOCK "VarFileInfo"