Merge branch 'newManual' of charmgit:charm into newManual
authorLaxmikant Kale <kale@illinois.edu>
Tue, 24 Jul 2012 20:28:00 +0000 (15:28 -0500)
committerLaxmikant Kale <kale@illinois.edu>
Tue, 24 Jul 2012 20:28:00 +0000 (15:28 -0500)
commitdce9e26d162b33e8099bb5474766fe37c87bd21b
tree254fe97e4c6d834211cd03c8936bae7d9db7a92c
parenteb1033894434e4d35c0188f9ca05774a4d58cfda
parent06b93ec52b1f03da42cf9de7e7f3a179139515a4
Merge branch 'newManual' of charmgit:charm into newManual
merged

Conflicts:
doc/charm++/overview.tex
doc/charm++/overview.tex