Merge branch 'master' into hotfix3

MahApps · Jan 16, 2016 · b22cfe2 · b22cfe2
2 parents 88a3fda + 5c37cef
commit b22cfe2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/MahApps.Metro/MahApps.Metro.nuspec b/MahApps.Metro/MahApps.Metro.nuspec
@@ -2,10 +2,10 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>MahApps.Metro</id>
-    <version>1.2.2.0</version>
+    <version>1.2.3.0</version>
     <title>MahApps.Metro</title>
-    <authors>Paul Jenkins; Jake Ginnivan; Brendan Forster (shiftkey); Alex Mitchell (Amrykid); Dennis Daume (flagbug); Jan Karger (punker76)</authors>
-    <owners>Paul Jenkins; Jake Ginnivan</owners>
+    <authors>Jan Karger, Dennis Daume, Brendan Forster, Paul Jenkins, Jake Ginnivan, Alex Mitchell</authors>
+    <owners>punker76,shiftkey,aeoth,jakeginnivan</owners>
     <licenseUrl>http://www.opensource.org/licenses/MS-PL</licenseUrl>
     <projectUrl>https://github.com/MahApps/MahApps.Metro</projectUrl>
     <iconUrl>https://raw.githubusercontent.com/MahApps/MahApps.Metro/master/mahapps.metro.logo2.png</iconUrl>

diff --git a/MahApps.Metro/Properties/AssemblyInfo.cs b/MahApps.Metro/Properties/AssemblyInfo.cs
@@ -12,10 +12,10 @@
 [assembly: XmlnsDefinition("http://metro.mahapps.com/winfx/xaml/shared", "MahApps.Metro.Converters")]
 [assembly: XmlnsDefinition("http://metro.mahapps.com/winfx/xaml/controls", "MahApps.Metro.Controls")]
 
-[assembly: AssemblyVersion("1.2.2.0")]
-[assembly: AssemblyFileVersion("1.2.2.0")]
-[assembly: AssemblyInformationalVersion("1.2.2.0")]
+[assembly: AssemblyVersion("1.2.3.0")]
+[assembly: AssemblyFileVersion("1.2.3.0")]
+[assembly: AssemblyInformationalVersion("1.2.3.0")]
 [assembly: AssemblyTitleAttribute("MahApps.Metro")]
 [assembly: AssemblyDescriptionAttribute("Toolkit for creating Metro styled WPF apps")]
-[assembly: AssemblyProductAttribute("MahApps.Metro 1.2.2")]
+[assembly: AssemblyProductAttribute("MahApps.Metro 1.2.3")]
 [assembly: AssemblyCompany("MahApps")]
diff --git a/docs/release-notes/1.2.3.md b/docs/release-notes/1.2.3.md
@@ -0,0 +1,7 @@
+# Notes
+
+MahApps.Metro v1.2.3 bug fix release.
+
+# Bugfixes
+
+- #2320 Fixed window can't be moved around using a touch screen