Files
openide/java/java-tests
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
..