Merge branch 'charm' of charmgit:charm into charm
authorPritish Jetley <pjetley2@illinois.edu>
Tue, 6 Jul 2010 18:49:03 +0000 (13:49 -0500)
committerPritish Jetley <pjetley2@illinois.edu>
Tue, 6 Jul 2010 18:49:03 +0000 (13:49 -0500)
commit2e3963d50d5bae0e183ab0e1e233538237a6b453
tree59e16ce041af17f7cdc5fbba74496ec10dc8cfbc
parent2cb08e289737d0ab3e8e204a87b0e6a92c9d0a9c
parent060f0741883e9ea6f292501aa1d7686cdb14c30d
Merge branch 'charm' of charmgit:charm into charm

Conflicts:

src/arch/net-linux-amd64-cuda/conv-mach.sh
src/arch/cuda/hybridAPI/cuda-hybrid-api.cu