Marco Nelissen 6411b4432b am 77f8a7a3: am c81e43c8: resolved conflicts for merge 31957f1b to eclair-mr2 ...

Merge commit '77f8a7a37fe2c30e7bc9f5fc5523d5866f9a250f'

* commit '77f8a7a37fe2c30e7bc9f5fc5523d5866f9a250f':
  - add javadoc for the account manager

2009-10-29 18:31:58 -07:00

..

config

…

java

am 77f8a7a3: am c81e43c8: resolved conflicts for merge 31957f1b to eclair-mr2

2009-10-29 18:31:58 -07:00

jni

am b26ab463: am 10d32a33: Merge change I16dc1411 into eclair-mr2

2009-10-28 23:56:37 -07:00

res

am 69e73d01: am 102767cd: am d85c4b34: Merge change Idb328ab7 into eclair

2009-10-29 02:04:17 -07:00