Homec4science

Merge branch 'lammps-ro/master' (early part) into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 23 2013, 12:55.

Description

Merge branch 'lammps-ro/master' (early part) into lammps-icms

Resolved Conflicts:
doc/Manual.txt
src/USER-COLVARS/fix_colvars.cpp
src/variable.cpp
tools/msi2lmp/README
tools/msi2lmp/src/ReadCarFile.c
tools/msi2lmp/src/msi2lmp.c
tools/msi2lmp/src/msi2lmp.h

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS69fd52746cfe: Merge branch 'lammps-ro/master' (early part) into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 23 2013, 12:55

Merged Changes

CommitAuthorDetailsCommitted
6b4223f510d4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10279 f3b2605a-c512-4ea7… 
Jul 23 2013
40f46faac5bbsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10278 f3b2605a-c512-4ea7… 
Jul 23 2013
c102c621e339sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10277 f3b2605a-c512-4ea7… 
Jul 23 2013
bec0c049d838sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10276 f3b2605a-c512-4ea7… 
Jul 23 2013
268c782771f1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10275 f3b2605a-c512-4ea7… 
Jul 23 2013
9034be4e5e43sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10274 f3b2605a-c512-4ea7… 
Jul 23 2013
580bffefeae8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10273 f3b2605a-c512-4ea7… 
Jul 23 2013
e3bc276ce62fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10272 f3b2605a-c512-4ea7… 
Jul 23 2013
fb3e1ba89322sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10271 f3b2605a-c512-4ea7… 
Jul 23 2013
57da8e53df1bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10270 f3b2605a-c512-4ea7… 
Jul 23 2013