Homec4science

Merge branch 'master' into openmp-master

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 11 2011, 00:45.

Description

Merge branch 'master' into openmp-master

Resolved Conflicts:
doc/processors.txt

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSd7aab37be45e: Merge branch 'master' into openmp-master (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 11 2011, 00:45

Merged Changes

CommitAuthorDetailsCommitted
adbeb0277bb2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7336 f3b2605a-c512-4ea7… 
Dec 10 2011
43a79f1a5690sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7335 f3b2605a-c512-4ea7… 
Dec 9 2011
58c001ef73d8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7334 f3b2605a-c512-4ea7… 
Dec 9 2011
5baa07d3afe1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7333 f3b2605a-c512-4ea7… 
Dec 9 2011
7060c62c8d43sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7332 f3b2605a-c512-4ea7… 
Dec 9 2011
3ad813f0323bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7331 f3b2605a-c512-4ea7… 
Dec 9 2011
7eccb3b489b6sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7330 f3b2605a-c512-4ea7… 
Dec 9 2011