Konstantin Lopyrev ea5282cf90 Merge "resolved conflicts for merge of f00ee0f7 to master"

2010-08-10 21:49:04 -07:00

..

config

…

java

resolved conflicts for merge of f00ee0f7 to master

2010-08-10 21:47:34 -07:00

jni

Add extra blending modes.

2010-08-10 21:42:40 -07:00

res

Import revised translations.

2010-08-10 12:10:18 -07:00

tests

am 7cb0fc58: am edae848e: am 301c437b: Remove @LargeTest annotations

2010-08-10 12:04:04 -07:00