Homec4science

Merge branch 'master' into openmp-master

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 7 2012, 17:57.

Description

Merge branch 'master' into openmp-master

Resolved Conflicts:
src/GPU/pppm_gpu.cpp
src/USER-REAXC/pair_reax_c.h
tools/restart2data.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS68ac4a3356fe: Merge branch 'master' into openmp-master (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 7 2012, 17:57

Merged Changes

CommitAuthorDetailsCommitted
7638f8ea7c61sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7464 f3b2605a-c512-4ea7… 
Jan 7 2012
bff244e206desjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7463 f3b2605a-c512-4ea7… 
Jan 7 2012
64be81e57153sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7459 f3b2605a-c512-4ea7… 
Jan 6 2012
5e7a75160a7esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7458 f3b2605a-c512-4ea7… 
Jan 6 2012
6e8418d36f98sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7456 f3b2605a-c512-4ea7… 
Jan 6 2012
2b742fac28d2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7455 f3b2605a-c512-4ea7… 
Jan 6 2012
cf4145cfe583sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7454 f3b2605a-c512-4ea7… 
Jan 6 2012
aee60101d160sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7453 f3b2605a-c512-4ea7… 
Jan 6 2012
5b62a1cb926asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7452 f3b2605a-c512-4ea7… 
Jan 6 2012
7cbf5d0dc785sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7450 f3b2605a-c512-4ea7… 
Jan 6 2012
1081c8062b1bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7449 f3b2605a-c512-4ea7… 
Jan 6 2012
43b81297d7b2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7448 f3b2605a-c512-4ea7… 
Jan 6 2012
78385ca341ffsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7446 f3b2605a-c512-4ea7… 
Jan 6 2012
062409ad340esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7445 f3b2605a-c512-4ea7… 
Jan 6 2012
63de8e36128fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7443 f3b2605a-c512-4ea7… 
Jan 6 2012
c5ae5bdb1b97sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7441 f3b2605a-c512-4ea7… 
Jan 6 2012
02532720cd78sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7440 f3b2605a-c512-4ea7… 
Jan 6 2012
4c698a05e565sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7439 f3b2605a-c512-4ea7… 
Jan 6 2012
a10a77764004sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7437 f3b2605a-c512-4ea7… 
Jan 6 2012
bc9971341fd6sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7436 f3b2605a-c512-4ea7… 
Jan 6 2012
1215b8acccfcsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7435 f3b2605a-c512-4ea7… 
Jan 6 2012
033d0e654680sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7434 f3b2605a-c512-4ea7… 
Jan 6 2012
edcd54b2eb10sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7433 f3b2605a-c512-4ea7… 
Jan 6 2012
0af770b923afsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7432 f3b2605a-c512-4ea7… 
Jan 6 2012
45d04dc45a9asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7429 f3b2605a-c512-4ea7… 
Jan 6 2012
725929a727e9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7427 f3b2605a-c512-4ea7… 
Jan 6 2012
aac0e5699f0esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7426 f3b2605a-c512-4ea7… 
Jan 6 2012
bbdb30077879sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7424 f3b2605a-c512-4ea7… 
Jan 6 2012
8c63a6ef5366sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7423 f3b2605a-c512-4ea7… 
Jan 6 2012
a242911efdfasjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7422 f3b2605a-c512-4ea7… 
Jan 6 2012
19ee529faf1bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7421 f3b2605a-c512-4ea7… 
Jan 6 2012
2a3b7a830512sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7420 f3b2605a-c512-4ea7… 
Jan 6 2012