Homec4science

Merge branch 'master' into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 15 2012, 15:42.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/GPU/pppm_gpu.h

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSa9b765721b05: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 15 2012, 15:42

Merged Changes

CommitAuthorDetailsCommitted
0ffe33f6c8bdsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7790 f3b2605a-c512-4ea7… 
Feb 14 2012
9add1067adf4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7789 f3b2605a-c512-4ea7… 
Feb 14 2012
96a049ee4399sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7788 f3b2605a-c512-4ea7… 
Feb 14 2012
3cd70fc0cdfbsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7786 f3b2605a-c512-4ea7… 
Feb 14 2012
40cf019065f3sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7784 f3b2605a-c512-4ea7… 
Feb 14 2012
323750f484cfsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7783 f3b2605a-c512-4ea7… 
Feb 14 2012
7a22c7924478sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7782 f3b2605a-c512-4ea7… 
Feb 14 2012
860fbe49c120sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7781 f3b2605a-c512-4ea7… 
Feb 14 2012
61dac0f38d17pscrozi
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7780 f3b2605a-c512-4ea7… 
Feb 14 2012
6b113450dbbbsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7779 f3b2605a-c512-4ea7… 
Feb 14 2012