diff --git a/trunk/Settings.StyleCop b/Settings.StyleCop
similarity index 93%
rename from trunk/Settings.StyleCop
rename to Settings.StyleCop
index fad8a5b..5025b0c 100644
--- a/trunk/Settings.StyleCop
+++ b/Settings.StyleCop
@@ -1,8 +1,14 @@
 <StyleCopSettings Version="105">
   <GlobalSettings>
     <StringProperty Name="Culture">en-GB</StringProperty>
-    <StringProperty Name="MergeSettingsFiles">NoMerge</StringProperty>
   </GlobalSettings>
+  <Parsers>
+    <Parser ParserId="StyleCop.CSharp.CsParser">
+      <ParserSettings>
+        <BooleanProperty Name="AnalyzeDesignerFiles">False</BooleanProperty>
+      </ParserSettings>
+    </Parser>
+  </Parsers>
   <Analyzers>
     <Analyzer AnalyzerId="StyleCop.CSharp.DocumentationRules">
       <Rules>