Evgeny Pasynkov e78ff0a342 Merge branch 'master' into upsource-master ...

Conflicts:
	plugins/gettext/src/com/jetbrains/gettext/highlighter/GetTextHighlighterData.java

2012-07-11 16:28:46 +02:00

..

src/com/intellij

Merge branch 'master' into upsource-master

2012-07-11 16:28:46 +02:00

java-impl.iml

removed common-collections

2012-07-06 14:16:36 +04:00