Jean-Baptiste Queru a74df10ac2 resolved conflicts for merge of cfccf5a1 to master

2009-12-10 09:19:02 -08:00

..

config

…

java

am 274b8c58: am 7b935e84: Merge change Iead0d4d8 into eclair-mr2

2009-12-10 09:12:00 -08:00

jni

am 68a3b8b6: am 24eca800: Merge change I887f355f into eclair-mr2

2009-12-10 07:05:18 -08:00

res

resolved conflicts for merge of cfccf5a1 to master

2009-12-10 09:19:02 -08:00