Merge branch 'charm' of charmgit:charm into charm
authorChao Mei <chaomei2@illinois.edu>
Wed, 26 May 2010 22:09:36 +0000 (17:09 -0500)
committerChao Mei <chaomei2@illinois.edu>
Wed, 26 May 2010 22:09:36 +0000 (17:09 -0500)
commit7fbaa06cd5c98350486c7ebf6c57f2c33f701386
tree28ba254b074d8680bbebbcdce87fc3e0d1f37913
parent30729fa4d409ae7f86f2f5e83034a20b327a5d8c
parent9b68cd31b4353a4dd92b0d8472f805b8e9c85a37
Merge branch 'charm' of charmgit:charm into charm
src/scripts/configure
src/scripts/configure.in