Merge branch 'newManual' into charm
authorRamprasad Venkataraman <ramv@illinois.edu>
Tue, 18 Sep 2012 23:00:21 +0000 (18:00 -0500)
committerRamprasad Venkataraman <ramv@illinois.edu>
Tue, 18 Sep 2012 23:00:21 +0000 (18:00 -0500)
commit4c41cafd51fbe876f7fa9a363915719b1a20e904
treeaa2a803e6d24ff7175ee4b7ebc508e06ba69701c
parent1746265c646161b66fbc14a9b47f7537a4080395
parente5a0332f1758b28d13287eeecf16f9edb3ad7d57
Merge branch 'newManual' into charm

Surprising number of conflicts for something like this.
The conflict in bgp/conv-mach was pure whitespace!

Also restored source for matmul2d example which seems non-empty, contrary
to what commit 69e437925524ecb3 claims.

Conflicts:
doc/charm++/order.tex
doc/libraries/liveviz.tex
examples/charm++/topology/matmul2d/matmul2d.C
src/arch/bluegenep/conv-mach.h
doc/charm++/order.tex
doc/libraries/liveviz.tex