Merge branch 'master' of git.labs.intellij.net:idea/community

Conflicts:
	platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java
This commit is contained in:
Dmitry Trofimov
2010-11-11 21:36:40 +03:00
613 changed files with 194624 additions and 191225 deletions
@@ -0,0 +1,7 @@
public class Foooo {
{
for (fin<caret>x)
}
}