Merge branch 'release/0.9.6' into develop

This commit is contained in:
Antony Male 2014-04-24 13:09:51 +01:00
commit 9eba316ead
3 changed files with 8 additions and 3 deletions

View File

@ -1,6 +1,11 @@
Stylet Changelog Stylet Changelog
================ ================
v0.9.6
------
- Fix bug when starting the bootloader
v0.9.5 v0.9.5
------ ------

View File

@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
<metadata> <metadata>
<id>Stylet</id> <id>Stylet</id>
<version>0.9.5</version> <version>0.9.6</version>
<title>Stylet</title> <title>Stylet</title>
<authors>Antony Male</authors> <authors>Antony Male</authors>
<owners>Antony Male</owners> <owners>Antony Male</owners>

View File

@ -35,5 +35,5 @@ using System.Windows.Markup;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.5.0")] [assembly: AssemblyVersion("0.9.6.0")]
[assembly: AssemblyFileVersion("0.9.5.0")] [assembly: AssemblyFileVersion("0.9.6.0")]