peter 4dd1c9f772 Merge branch 'master' into sort ...

Conflicts:
	platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/impl/VirtualDirectoryImpl.java

2011-02-15 21:25:18 +01:00

..

src/com/intellij

Merge branch 'master' into sort

2011-02-15 21:25:18 +01:00

openapi.iml

changed scope to 'test' for dependencies on junit

2011-02-11 11:35:11 +03:00