Homec4science

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 16 2013, 10:18.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
doc/Manual.txt
src/USER-OMP/msm_omp.h

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSa3603ca40fca: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 16 2013, 10:18

Merged Changes

CommitAuthorDetailsCommitted
0a97cb8e9a6apscrozi
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9694 f3b2605a-c512-4ea7… 
Mar 15 2013
505a0dd4f479sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9691 f3b2605a-c512-4ea7… 
Mar 14 2013
32f9bf830620sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9690 f3b2605a-c512-4ea7… 
Mar 14 2013
6b884058df86sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9689 f3b2605a-c512-4ea7… 
Mar 14 2013
28480c5221d5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9688 f3b2605a-c512-4ea7… 
Mar 14 2013
040cedbe5aa1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9687 f3b2605a-c512-4ea7… 
Mar 14 2013
eeecd6980262sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9680 f3b2605a-c512-4ea7… 
Mar 14 2013
788b657922e1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9663 f3b2605a-c512-4ea7… 
Mar 13 2013
ba0c0a959c8esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9662 f3b2605a-c512-4ea7… 
Mar 13 2013
a200f0ae3814sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9661 f3b2605a-c512-4ea7… 
Mar 13 2013
b78c4aa84167sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9660 f3b2605a-c512-4ea7… 
Mar 13 2013
a58779babf62sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9659 f3b2605a-c512-4ea7… 
Mar 13 2013
0cd14bfb847asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9658 f3b2605a-c512-4ea7… 
Mar 13 2013
9897d3854216sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9657 f3b2605a-c512-4ea7… 
Mar 13 2013
7fbf90ea90b9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9656 f3b2605a-c512-4ea7… 
Mar 13 2013