Homec4science

Merge branch 'master' into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 4 2012, 19:12.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/USER-MISC/pair_meam_spline.h
tools/pymol_asphere/src/error.cpp
tools/restart2data.cpp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSdd0057e65038: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 4 2012, 19:12

Merged Changes

CommitAuthorDetailsCommitted
6ba1e93f5d0asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7694 f3b2605a-c512-4ea7… 
Feb 4 2012
8c770f1bed90sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7693 f3b2605a-c512-4ea7… 
Feb 3 2012
8e891d019425sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7691 f3b2605a-c512-4ea7… 
Feb 3 2012
4381a1702befsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7690 f3b2605a-c512-4ea7… 
Feb 3 2012
64ab68a56198sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7688 f3b2605a-c512-4ea7… 
Feb 3 2012
ddee962c16d3sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7687 f3b2605a-c512-4ea7… 
Feb 3 2012
7fb5f449e413sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7686 f3b2605a-c512-4ea7… 
Feb 3 2012
301e696b5eccsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7685 f3b2605a-c512-4ea7… 
Feb 3 2012
cd78615a7b47sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7684 f3b2605a-c512-4ea7… 
Feb 3 2012
c9446b61831dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7683 f3b2605a-c512-4ea7… 
Feb 3 2012
9b3b8d2f3a11sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7682 f3b2605a-c512-4ea7… 
Feb 3 2012
b99a70674471sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7680 f3b2605a-c512-4ea7… 
Feb 3 2012