diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-07-08 16:38:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-08 16:38:42 +0000 |
| commit | f3454a78fdada5b110035197ac4a7ce0eb223b6e (patch) | |
| tree | 97706588b1e8bc1b841561877a2efe5f645d40d4 /.idea | |
| parent | 3522910d23672dc599e2695a993883dd41e1b652 (diff) | |
| parent | c3406c271c24ef6c1cfb8550b1c691b3b92ca115 (diff) | |
| download | idea-f3454a78fdada5b110035197ac4a7ce0eb223b6e.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/snapshot-master' into mergebranch"
Diffstat (limited to '.idea')
| -rw-r--r-- | .idea/codeStyleSettings.xml | 4 | ||||
| -rw-r--r-- | .idea/inspectionProfiles/idea_default.xml | 9 | ||||
| -rw-r--r-- | .idea/inspectionProfiles/idea_default_no_spellchecker.xml | 3 |
3 files changed, 12 insertions, 4 deletions
diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml index 3bb1d821e856..0b13401d8804 100644 --- a/.idea/codeStyleSettings.xml +++ b/.idea/codeStyleSettings.xml @@ -251,6 +251,10 @@ <option name="FOR_BRACE_FORCE" value="1" /> <option name="PARENT_SETTINGS_INSTALLED" value="true" /> </codeStyleSettings> + <codeStyleSettings language="Python"> + <option name="KEEP_LINE_BREAKS" value="false" /> + <option name="PARENT_SETTINGS_INSTALLED" value="true" /> + </codeStyleSettings> <codeStyleSettings language="SQL"> <option name="PARENT_SETTINGS_INSTALLED" value="true" /> </codeStyleSettings> diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml index 7a864737f05f..e6507bc818a4 100644 --- a/.idea/inspectionProfiles/idea_default.xml +++ b/.idea/inspectionProfiles/idea_default.xml @@ -371,8 +371,11 @@ <inspection_tool class="PyChainedComparisonsInspection" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="PyComparisonWithNoneInspection" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="PyCompatibilityInspection" enabled="false" level="ERROR" enabled_by_default="false"> - <option name="fromVersion" value="2.4" /> - <option name="toVersion" value="3.1" /> + <option name="ourVersions"> + <value> + <list size="0" /> + </value> + </option> </inspection_tool> <inspection_tool class="PyDecoratorInspection" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="PyDefaultArgumentInspection" enabled="false" level="WARNING" enabled_by_default="false" /> @@ -621,4 +624,4 @@ <inspection_tool class="XsltUnusedDeclaration" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="XsltVariableShadowing" enabled="false" level="WARNING" enabled_by_default="false" /> </profile> -</component>
\ No newline at end of file +</component> diff --git a/.idea/inspectionProfiles/idea_default_no_spellchecker.xml b/.idea/inspectionProfiles/idea_default_no_spellchecker.xml index 6f2a1a40004b..026583e0d366 100644 --- a/.idea/inspectionProfiles/idea_default_no_spellchecker.xml +++ b/.idea/inspectionProfiles/idea_default_no_spellchecker.xml @@ -812,6 +812,7 @@ <inspection_tool class="VtlTypesInspection" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="W3CssValidation" enabled="false" level="WARNING" enabled_by_default="false"> <option name="myCssVersion" value="css3" /> + <option name="myIgnoreVendorSpecificProperties" value="false" /> </inspection_tool> <inspection_tool class="WSReferenceInspection" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="WaitNotInLoop" enabled="true" level="WARNING" enabled_by_default="true" /> @@ -850,4 +851,4 @@ <inspection_tool class="osmorcNonOsgiMavenDependency" enabled="false" level="WARNING" enabled_by_default="false" /> <inspection_tool class="osmorcUnregisteredActivator" enabled="false" level="ERROR" enabled_by_default="false" /> </profile> -</component>
\ No newline at end of file +</component> |