From 8a2b3bdd016123c486110fa6d05d12c0139a583a Mon Sep 17 00:00:00 2001 From: Antony Male Date: Thu, 24 Apr 2014 12:59:50 +0100 Subject: [PATCH 1/2] Update changelog --- CHANGELOG.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index bf7ad5d..ad06755 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,13 @@ Stylet Changelog ================ +v0.9.5 +------ + + - Add StyletConductorItemsControl style, for using an ItemsControl with a Conductor.Collection.AllActive + - Make Execute.OnUIThread synchronous, and add BeginOnUIThread (asynchronous) + - Rename conductors. It's now Conductor.Collection.xxx not Conductor.Collections.xxx + v0.9.4 ------ From 3c83c9674e61ef74a40b11d8e32cfa3a1d948b3e Mon Sep 17 00:00:00 2001 From: Antony Male Date: Thu, 24 Apr 2014 13:00:12 +0100 Subject: [PATCH 2/2] Bump version --- NuGet/Stylet.nuspec | 2 +- Stylet/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet/Stylet.nuspec b/NuGet/Stylet.nuspec index cc3ecc7..f82aba4 100644 --- a/NuGet/Stylet.nuspec +++ b/NuGet/Stylet.nuspec @@ -2,7 +2,7 @@ Stylet - 0.9.4 + 0.9.5 Stylet Antony Male Antony Male diff --git a/Stylet/Properties/AssemblyInfo.cs b/Stylet/Properties/AssemblyInfo.cs index e00489c..5ad645a 100644 --- a/Stylet/Properties/AssemblyInfo.cs +++ b/Stylet/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ using System.Windows.Markup; // 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("0.9.4.0")] -[assembly: AssemblyFileVersion("0.9.4.0")] +[assembly: AssemblyVersion("0.9.5.0")] +[assembly: AssemblyFileVersion("0.9.5.0")]