diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
|---|---|---|
| committer | Tor Norbye <tnorbye@google.com> | 2014-07-25 13:10:36 -0700 |
| commit | e5266e2343c8d275d79fa0be725180d0fe3a993c (patch) | |
| tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /platform/lang-impl/src/com/intellij/application/options/CodeStyleSettingsUtilImpl.java | |
| parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
| parent | 2e5965e996aad62ab1338b09d54caaf99ff3dd6a (diff) | |
| download | idea-e5266e2343c8d275d79fa0be725180d0fe3a993c.tar.gz | |
Merge remote-tracking branch 'aosp/upstream-master' into merge
Conflicts:
.idea/modules.xml
Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143
Diffstat (limited to 'platform/lang-impl/src/com/intellij/application/options/CodeStyleSettingsUtilImpl.java')
| -rw-r--r-- | platform/lang-impl/src/com/intellij/application/options/CodeStyleSettingsUtilImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSettingsUtilImpl.java b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSettingsUtilImpl.java index 640fcac38652..418cc3ccef6d 100644 --- a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSettingsUtilImpl.java +++ b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSettingsUtilImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettingsManager; public class CodeStyleSettingsUtilImpl extends CodeStyleSettingsUtil { /** - * Shows code style settings sutable for the project passed. I.e. it shows project code style page if one + * Shows code style settings suitable for the project passed. I.e. it shows project code style page if one * is configured to use own code style scheme or global one in other case. * @param project * @return Returns true if settings were modified during editing session. |