diff --git a/Application/FileConverter/Application.xaml.cs b/Application/FileConverter/Application.xaml.cs index 6e693a1..713b8d3 100644 --- a/Application/FileConverter/Application.xaml.cs +++ b/Application/FileConverter/Application.xaml.cs @@ -38,8 +38,8 @@ namespace FileConverter private static readonly Version Version = new Version() { Major = 2, - Minor = 0, - Patch = 2, + Minor = 1, + Patch = 0, }; private bool needToRunConversionThread; diff --git a/Application/FileConverter/Properties/AssemblyInfo.cs b/Application/FileConverter/Properties/AssemblyInfo.cs index 54160ae..6211e08 100644 --- a/Application/FileConverter/Properties/AssemblyInfo.cs +++ b/Application/FileConverter/Properties/AssemblyInfo.cs @@ -49,5 +49,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.0")] +[assembly: AssemblyVersion("2.1.0.0")] +[assembly: AssemblyFileVersion("2.1.0.0")] diff --git a/CHANGELOG.md b/CHANGELOG.md index e931cf2..f182fdc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Change Log -## Next Version +## Version 2.1 - New: Option to use NVidia hardware acceleration for mp4 video (thanks to tacheometry). - New: Add Gif to Image conversion support (issue #433, #115) (thanks to RTnhN) diff --git a/Installer/Installer.wixproj b/Installer/Installer.wixproj index 7fb7966..81a5370 100644 --- a/Installer/Installer.wixproj +++ b/Installer/Installer.wixproj @@ -1,6 +1,6 @@  - 2.0.2 + 2.1.0 FileConverter-setup bin\$(Platform)\$(Configuration)\ obj\$(Platform)\$(Configuration)\ diff --git a/Installer/Product.wxs b/Installer/Product.wxs index abfd61a..ba6458e 100644 --- a/Installer/Product.wxs +++ b/Installer/Product.wxs @@ -1,6 +1,6 @@  - +