Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 20 2013, 12:24.

Description

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

Resolved Conflicts:
src/Depend.sh

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS19e0d5e1fa7b: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 20 2013, 12:24

Merged Changes

CommitAuthorDetailsCommitted
ab502fda5977sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9893 f3b2605a-c512-4ea7… 
May 19 2013
471694a7e7beathomps
Added Strachan citation to rdx, removed Al_Al0_AlN 
May 17 2013
e7f6d3b60cbcathomps
Added ReaxFF.lg citation 
May 17 2013