diff .idea/codeStyleSettings.xml @ 4310:71bb731377e2

Automated merge with ssh://jfxsrc.us.oracle.com//javafx/8.0/MASTER/jfx/rt
author jgodinez
date Tue, 16 Jul 2013 09:51:36 -0700
parents d679865a5840 dea00f4f6753
children
line wrap: on
line diff
--- a/.idea/codeStyleSettings.xml	Thu Jul 11 15:48:25 2013 -0700
+++ b/.idea/codeStyleSettings.xml	Tue Jul 16 09:51:36 2013 -0700
@@ -3,26 +3,11 @@
   <component name="ProjectCodeStyleSettingsManager">
     <option name="PER_PROJECT_SETTINGS">
       <value>
-        <option name="LINE_SEPARATOR" value="&#10;" />
-        <option name="IMPORT_LAYOUT_TABLE">
-          <value>
-            <package name="java" withSubpackages="true" static="false" />
-            <package name="javax" withSubpackages="true" static="false" />
-            <package name="javafx.*" withSubpackages="true" static="false" />
-            <package name="" withSubpackages="true" static="false" />
-            <package name="" withSubpackages="true" static="true" />
-          </value>
-        </option>
-        <option name="RIGHT_MARGIN" value="80" />
         <XML>
           <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
         </XML>
-        <codeStyleSettings language="JAVA">
-          <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
-        </codeStyleSettings>
       </value>
     </option>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
   </component>
 </project>