Merge branch 'master' into auto
authorpeter.gromov <peter@jetbrains.com>
Thu, 30 Sep 2010 14:02:14 +0000 (18:02 +0400)
committerpeter.gromov <peter@jetbrains.com>
Thu, 30 Sep 2010 14:02:14 +0000 (18:02 +0400)
commit5329a3eed723175e2777d9a414b292fed5751370
treeeb09d84bb21012389435b576d714df7f8d63d791
parent52b7f81047446f090bce800869fe9adf0d6297af
parent274ec17b1e5a3b795963a3d5e41fe04014e285ee
Merge branch 'master' into auto
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
platform/platform-resources/src/META-INF/LangExtensions.xml