Version 1.2.0

dsafa · Apr 11, 2019 · c9cc4a7 · c9cc4a7
2 parents cdcee41 + 932058c
commit c9cc4a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/WpfColorPicker/ColorPickerDialog.xaml b/src/WpfColorPicker/ColorPickerDialog.xaml
@@ -70,8 +70,8 @@
         </ItemsControl>
         <StackPanel Grid.Row="2" Grid.Column="1" Orientation="Horizontal"
                     HorizontalAlignment="Right" VerticalAlignment="Bottom">
-            <Button Content="Cancel" Width="60" Height="25" Margin="4,0" IsCancel="True" Click="CancelButtonOnClick"/>
             <Button Content="Ok" Width="60" Height="25" IsDefault="True" Click="OkButtonOnClick"/>
+            <Button Content="Cancel" Width="60" Height="25" Margin="4,0" IsCancel="True" Click="CancelButtonOnClick"/>
         </StackPanel>
     </Grid>
 </Window>
diff --git a/src/WpfColorPicker/Properties/AssemblyInfo.cs b/src/WpfColorPicker/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // 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("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]
 
 [assembly: InternalsVisibleTo("WpfColorPickerTests")]