Andrei Popescu 9af8374e09 am 5b95f833: am 486733c1: Merge change I94856f6d into eclair ...

Merge commit '5b95f83356f130e138f3e9a26a1580c479eb955d'

* commit '5b95f83356f130e138f3e9a26a1580c479eb955d':
  Update <video> implementation after new IRC discussion with Eric Carlsson.

2009-10-01 12:16:14 -07:00

..

config

…

java

am 5b95f833: am 486733c1: Merge change I94856f6d into eclair

2009-10-01 12:16:14 -07:00

jni

am ba61cff4: am e5661c40: Merge change I8366852f into eclair

2009-10-01 12:13:57 -07:00

res

am 7c749f81: am 27d8514f: Merge change I78f113bc into eclair

2009-10-01 12:15:55 -07:00