Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP

View/StuffView.xaml

@@ -4,6 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:Audit.View"
+             xmlns:ColorSQLConvert="clr-namespace:Audit.ColorSQLConvert"
              xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
              mc:Ignorable="d" DataContext="{Binding Source={StaticResource Locator},Path=Stuff}"
              d:DesignHeight="900" d:DesignWidth="1140"
@@ -51,6 +52,7 @@
                 </Setter.Value>
             </Setter>
         </Style>
+        <ColorSQLConvert:ColorSQLConvert x:Key="ColorSQLConvert"/>
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>