Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 1 2014, 13:10.

Description

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

Resolved Conflicts:
lib/gpu/lal_answer.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSc03e3951aa7f: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 1 2014, 13:10

Merged Changes

CommitAuthorDetailsCommitted
52408b16d2a9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12677 f3b2605a-c512-4ea7… 
Oct 31 2014

Empty Commit

This commit is empty and does not affect any paths.