Homec4science

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 21 2013, 12:19.

Description

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

Resolved Conflicts:
doc/dump.txt
src/lammps.cpp
src/lammps.h

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSb67ae4c6fb9d: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 21 2013, 12:19

Merged Changes

CommitAuthorDetailsCommitted
c8e63e0f604csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11030 f3b2605a-c512-4ea7… 
Nov 20 2013
643a6c0c564esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11029 f3b2605a-c512-4ea7… 
Nov 20 2013
16e11bfd6e89sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11028 f3b2605a-c512-4ea7… 
Nov 20 2013
ec6c60273019sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11027 f3b2605a-c512-4ea7… 
Nov 20 2013
5ec8a7c9304fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11026 f3b2605a-c512-4ea7… 
Nov 20 2013
cd11570fedbbsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11025 f3b2605a-c512-4ea7… 
Nov 20 2013