Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 12 2014, 02:43.

Description

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

Resolved Conflicts:
src/USER-FEP/fix_adapt_fep.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS9f554da42e30: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 12 2014, 02:43

Merged Changes

CommitAuthorDetailsCommitted
165dcc31ce4asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12634 f3b2605a-c512-4ea7… 
Oct 10 2014
b1fea4af6c16sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12633 f3b2605a-c512-4ea7… 
Oct 10 2014
04a786241d24sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12632 f3b2605a-c512-4ea7… 
Oct 10 2014
a9906d102356sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12631 f3b2605a-c512-4ea7… 
Oct 10 2014
13ebe937e2cfsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12630 f3b2605a-c512-4ea7… 
Oct 10 2014