Dmitry Lomov ce976c8919 Merge branch 'master' into upsource-master ...

Conflicts:
	platform/projectModel-impl/src/com/intellij/openapi/components/impl/BasePathMacroManager.java

2012-06-14 18:17:23 +02:00

..

src

Move PsiSearchHelperImpl to "indexing-impl". Introduce components for supplementary stuff

2012-06-13 16:53:39 +02:00

dom-impl.iml

Cleanup

2012-06-08 20:31:53 +04:00