Merge branch 'charm' of charmgit:charm into charm
authorXiang Ni <xiangni2@illinois.edu>
Mon, 16 Jan 2012 18:01:15 +0000 (12:01 -0600)
committerXiang Ni <xiangni2@illinois.edu>
Mon, 16 Jan 2012 18:01:15 +0000 (12:01 -0600)
commit49be1bb1d8f5e33a530daffcfbf1dd39a0d8f3d7
tree2bed772d4b84fba63b2b08712452e9175b448e8f
parenteb914b92e762c2fb901b2a87622360c168cfe355
parent6f6bfe796e0c685196838d100a49ed69afa70e89
Merge branch 'charm' of charmgit:charm into charm
src/conv-core/convcore.c
src/conv-core/converse.h