2 Commits

Author	SHA1	Message	Date
Dmitry Trofimov	439d1455d2	Merge branch 'master' of git.labs.intellij.net:idea/community ... Conflicts: platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleManagerImpl.java	2010-11-11 21:36:40 +03:00
peter.gromov	f4fafcbb4b	IDEA-60822 [IdeaX] code completion for "for(fin" automatically chooses "for(finalize()" instead of "for(final"	2010-11-11 21:03:29 +03:00