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

..

common

refactor execution of android tools, implement better api

2012-07-09 19:19:02 +04:00

jps-plugin

support parallel compilation for independent module chunks: merge

2012-07-10 14:48:07 +02:00

lib

upgrade android libraries

2012-07-05 12:17:44 +04:00

resources

warning: manifest merging is not supported

2012-07-06 19:01:58 +04:00

rt

…

src

Merge branch 'master' into upsource-master

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

testData

IDEA-87978 add 'plurals' resource type to android dom model

2012-07-06 15:44:48 +04:00

testSrc/org/jetbrains/android

additional logging for blinking tests

2012-07-09 16:35:33 +04:00

android.iml

move searchers to indexing module

2012-06-22 08:55:07 +02:00

build.xml

…

idea-android.iml

…

idea-android.ipr

…