Jean-Baptiste Queru 80ffd8c5ae resolved conflicts for merge of da9691e9 to master

2009-12-10 15:46:33 -08:00

..

config

…

java

resolved conflicts for merge of da9691e9 to master

2009-12-10 15:46:33 -08:00

jni

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

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

res

use a fixed value for public ID

2009-12-10 11:14:41 -08:00